yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity

wups

Browse source
This commit is contained in:
Karl 'vollmerk' Vollmer 2005-07-16 06:22:32 +00:00
parent 4a9909a8a1
commit 3d1fbbfb74
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/ui.lib.php
View file

@ -461,7 +461,9 @@ function get_now_playing() {
$results[] = array('song'=>$song,'user'=>$np_user); $results[] = array('song'=>$song,'user'=>$np_user);
} // end while } // 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') . "/" . $sql = "SELECT song.id FROM song WHERE file = \"". conf('mpd_dir') . "/" .
$myMpd->playlist[$myMpd->current_track_id]['file']. "\""; $myMpd->playlist[$myMpd->current_track_id]['file']. "\"";

2
modules/init.php
View file

@ -159,6 +159,7 @@ require_once(conf('prefix') . "/lib/search.php");
require_once(conf('prefix') . "/lib/preferences.php"); require_once(conf('prefix') . "/lib/preferences.php");
require_once(conf('prefix') . "/lib/rss.php"); require_once(conf('prefix') . "/lib/rss.php");
require_once(conf('prefix') . "/lib/log.lib.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/ui.lib.php");
require_once(conf('prefix') . "/lib/gettext.php"); require_once(conf('prefix') . "/lib/gettext.php");
require_once(conf('prefix') . "/lib/batch.lib.php"); require_once(conf('prefix') . "/lib/batch.lib.php");
@ -184,7 +185,6 @@ if (conf('allow_slim_playback')) {
if (conf('allow_mpd_playback')) { if (conf('allow_mpd_playback')) {
require_once(conf('prefix') . "/modules/mpd/mpd.class.php"); require_once(conf('prefix') . "/modules/mpd/mpd.class.php");
require_once(conf('prefix') . "/lib/mpd.php");
} }
// Classes // Classes