diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-07-16 06:22:32 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-07-16 06:22:32 +0000 |
| commit | 3d1fbbfb7491bcab9d32b017d2c09dcea7b7b14f (patch) | |
| tree | 678ae195b32467dce73c4ae6b4b90cb07df10211 | |
| parent | 4a9909a8a193a781d72a647b81e9de75a57428c6 (diff) | |
| download | ampache-3d1fbbfb7491bcab9d32b017d2c09dcea7b7b14f.tar.gz ampache-3d1fbbfb7491bcab9d32b017d2c09dcea7b7b14f.tar.bz2 ampache-3d1fbbfb7491bcab9d32b017d2c09dcea7b7b14f.zip | |
wups
| -rw-r--r-- | lib/ui.lib.php | 4 | ||||
| -rw-r--r-- | modules/init.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/ui.lib.php b/lib/ui.lib.php index b7e63fed..ceab9e36 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -461,7 +461,9 @@ function get_now_playing() { $results[] = array('song'=>$song,'user'=>$np_user); } // end while - if (is_object($GLOBALS['myMpd']) AND conf('mpd_method') == 'file') { + $myMpd = init_mpd(); + + if (is_object($myMpd) AND conf('mpd_method') == 'file') { $sql = "SELECT song.id FROM song WHERE file = \"". conf('mpd_dir') . "/" . $myMpd->playlist[$myMpd->current_track_id]['file']. "\""; diff --git a/modules/init.php b/modules/init.php index d38a5289..51e120b8 100644 --- a/modules/init.php +++ b/modules/init.php @@ -159,6 +159,7 @@ require_once(conf('prefix') . "/lib/search.php"); require_once(conf('prefix') . "/lib/preferences.php"); require_once(conf('prefix') . "/lib/rss.php"); require_once(conf('prefix') . "/lib/log.lib.php"); +require_once(conf('prefix') . "/lib/mpd.php"); require_once(conf('prefix') . "/lib/ui.lib.php"); require_once(conf('prefix') . "/lib/gettext.php"); require_once(conf('prefix') . "/lib/batch.lib.php"); @@ -184,7 +185,6 @@ if (conf('allow_slim_playback')) { if (conf('allow_mpd_playback')) { require_once(conf('prefix') . "/modules/mpd/mpd.class.php"); - require_once(conf('prefix') . "/lib/mpd.php"); } // Classes |