From c837dd5752ec436333fe246ce88a90ccfe6eae93 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Tue, 12 Jul 2005 07:16:40 +0000
Subject: more mpd fixes and xmlrpc fixes and simplified chinese

---
 templates/show_mpdplay.inc | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'templates/show_mpdplay.inc')

diff --git a/templates/show_mpdplay.inc b/templates/show_mpdplay.inc
index 0bc93027..188d0756 100644
--- a/templates/show_mpdplay.inc
+++ b/templates/show_mpdplay.inc
@@ -33,7 +33,7 @@ global $condPL;
 
 ?>
 <div align="center">
-<table border="0" cellpadding="3" cellspacing="0">
+<table border="0" cellpadding="3" cellspacing="0" class="tabledata">
 <tr class="table-header">
 	<td colspan="2"><?php echo _("MPD Play Control"); ?></td>
 </tr>
@@ -107,7 +107,16 @@ global $condPL;
       	<td><b><?php echo _("Now Playing :")?></b></td>
       </tr>
       <tr>
-      	<td align="center"><?php echo ($myMpd->current_track_id+1).
+      	<td align="center"><?php
+	if (!$$myMpd->playlist[($myMpd->current_track_id)]['Title']) {
+		list($tmp, $id, $tmp) = preg_split("/(song=|&)/", $myMpd->playlist[($myMpd->current_track_id)]['file']);
+		$r = new Song($id);
+		$myMpd->playlist[($myMpd->current_track_id)]['Title'] = $r->title;
+		$myMpd->playlist[($myMpd->current_track_id)]['Artist'] = $r->get_artist_name();
+		$myMpd->playlist[($myMpd->current_track_id)]['Album'] = $r->get_album_name();
+	}
+
+	echo ($myMpd->current_track_id+1).
                           ". ".$myMpd->playlist[$myMpd->current_track_id]['Artist'].
                           " - ".$myMpd->playlist[$myMpd->current_track_id]['Title'].
                           " - ".$myMpd->playlist[$myMpd->current_track_id]['Album'].
@@ -124,7 +133,16 @@ global $condPL;
         </td>
       </tr>
       <tr>
-      	<td align="center"><?php echo ($myMpd->current_track_id+2).
+      	<td align="center"><?php
+	if (!$$myMpd->playlist[($myMpd->current_track_id+1)]['Title']) {
+		list($tmp, $id, $tmp) = preg_split("/(song=|&)/", $myMpd->playlist[($myMpd->current_track_id+1)]['file']);
+		$r = new Song($id);
+		$myMpd->playlist[($myMpd->current_track_id+1)]['Title'] = $r->title;
+		$myMpd->playlist[($myMpd->current_track_id+1)]['Artist'] = $r->get_artist_name();
+		$myMpd->playlist[($myMpd->current_track_id+1)]['Album'] = $r->get_album_name();
+	}
+
+	echo ($myMpd->current_track_id+2).
                             ". ".$myMpd->playlist[($myMpd->current_track_id+1)]['Artist'].
                             " - ".$myMpd->playlist[($myMpd->current_track_id+1)]['Title'].
                             " - ".$myMpd->playlist[($myMpd->current_track_id+1)]['Album'].
-- 
cgit