diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-02-08 14:41:00 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-02-08 14:41:00 +0000 |
commit | e24192c441069d1117b5478950f4ffd21b8800c9 (patch) | |
tree | 9876cbec356e5101ccdaa2fe552b05a39ffd9c7d | |
parent | 9d6ca07ecbe8cdf3f92d61366d4a53c6b609d1f1 (diff) | |
download | ampache-e24192c441069d1117b5478950f4ffd21b8800c9.tar.gz ampache-e24192c441069d1117b5478950f4ffd21b8800c9.tar.bz2 ampache-e24192c441069d1117b5478950f4ffd21b8800c9.zip |
fixed mpd controller url parsing
-rw-r--r-- | lib/class/localplay.abstract.php | 1 | ||||
-rw-r--r-- | modules/localplay/mpd.controller.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/class/localplay.abstract.php b/lib/class/localplay.abstract.php index 324e15f0..e7baf0ef 100644 --- a/lib/class/localplay.abstract.php +++ b/lib/class/localplay.abstract.php @@ -106,6 +106,7 @@ abstract class localplay_controller { } } // end foreach + return $data; } // parse_url diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php index 08b790b1..24ab6f3d 100644 --- a/modules/localplay/mpd.controller.php +++ b/modules/localplay/mpd.controller.php @@ -480,8 +480,8 @@ class AmpacheMpd extends localplay_controller { $url_data = $this->parse_url($entry['file']); switch ($url_data['primary_key']) { - case 'song': - $song = new Song($url_data['song']); + case 'oid': + $song = new Song($url_data['oid']); $song->format(); $data['name'] = $song->f_title . ' - ' . $song->f_album . ' - ' . $song->f_artist; $data['link'] = $song->f_link; |