summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-08-02 06:55:26 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-08-02 06:55:26 +0000
commit2a008dc4abc86385b3059f82a2419b9514882dfe (patch)
treef5925786cb4cd1798c6dd8ff8c8fe235cabe0b38 /modules
parentba04cd2729b62daa1a7aa2d35814992c68c38430 (diff)
downloadampache-2a008dc4abc86385b3059f82a2419b9514882dfe.tar.gz
ampache-2a008dc4abc86385b3059f82a2419b9514882dfe.tar.bz2
ampache-2a008dc4abc86385b3059f82a2419b9514882dfe.zip
most of the new upload system, barely tested and not finished...
Diffstat (limited to 'modules')
-rw-r--r--modules/init.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/init.php b/modules/init.php
index 51e120b8..efcef4b8 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -83,7 +83,7 @@ if (!$results['conf']['allow_stream_playback']) {
}
$results['conf']['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
-$results['conf']['version'] = '3.3.2-Alpha2 Build (002)';
+$results['conf']['version'] = '3.3.2-Alpha2 Build (003)';
$results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx';
$results['libglue']['local_table'] = 'session';
$results['libglue']['local_sid'] = 'id';
@@ -173,11 +173,8 @@ require_once(conf('prefix') . "/modules/catalog.php");
require_once(conf('prefix') . "/modules/id3/audioinfo.class.php");
require_once(conf('prefix') . "/modules/amazon/Snoopy.class.php");
require_once(conf('prefix') . "/modules/amazon/AmazonSearchEngine.class.php");
-
-if (conf('xml_rpc')) {
- require_once(conf('prefix') . "/modules/xmlrpc/xmlrpc.inc");
- require_once(conf('prefix') . "/lib/xmlrpc.php");
-}
+require_once(conf('prefix') . "/lib/xmlrpc.php");
+require_once(conf('prefix') . "/modules/xmlrpc/xmlrpc.inc");
if (conf('allow_slim_playback')) {
require_once(conf('prefix') . "/modules/slimserver/slim.class.php");
@@ -187,6 +184,10 @@ if (conf('allow_mpd_playback')) {
require_once(conf('prefix') . "/modules/mpd/mpd.class.php");
}
+if (conf('allow_xmms2_playback')) {
+ require_once(conf('prefix') . "/modules/xmms2/xmms2.class.php");
+}
+
// Classes
require_once(conf('prefix') . "/lib/class/catalog.class.php");
require_once(conf('prefix') . "/lib/class/stream.class.php");