some more minor tweaks to democratic playlist, fixed now playing on localplay playlist

2 files changed, 5 insertions, 7 deletions

diff --git a/modules/localplay/httpq.controller.php b/modules/localplay/httpq.controller.php
index 43b6f889..f62a49a0 100644
--- a/modules/localplay/httpq.controller.php
+++ b/modules/localplay/httpq.controller.php
@@ -535,9 +535,8 @@ class AmpacheHttpq extends localplay_controller {
 		$array['random']	= $this->_httpq->get_random();
 		$array['track']		= $this->_httpq->get_now_playing();
 
-		preg_match("/song=(\d+)\&/",$array['track'],$matches);
-		$song_id = $matches['1'];
-		$song = new Song($song_id);
+		$url_data = $this->parse_url($array['track']); 
+		$song = new Song($url_data['oid']);
 		$array['track_title'] 	= $song->title;
 		$array['track_artist'] 	= $song->get_artist_name();
 		$array['track_album']	= $song->get_album_name();
diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php
index 24ab6f3d..928bf822 100644
--- a/modules/localplay/mpd.controller.php
+++ b/modules/localplay/mpd.controller.php
@@ -541,10 +541,9 @@ class AmpacheMpd extends localplay_controller {
 		$array['repeat']	= $this->_mpd->repeat;
 		$array['random']	= $this->_mpd->random;
 		$array['track']		= $track+1;
-
-		preg_match("/song=(\d+)\&/",$this->_mpd->playlist[$track]['file'],$matches);
-		$song_id = $matches['1'];
-		$song = new Song($song_id);
+		
+		$url_data = $this->parse_url($this->_mpd->playlist[$track]['file']);
+		$song = new Song($url_data['oid']);
 		$array['track_title'] 	= $song->title;
 		$array['track_artist'] 	= $song->get_artist_name();
 		$array['track_album']	= $song->get_album_name();