X-Git-Url: http://git.joshuawise.com/patchfork.git/blobdiff_plain/964dd0bc22ff252711b1190854923d5cd5382f9f..f8fb3735ae5063d8589a2d85eda35452592726c8:/std/command.js

diff --git a/std/command.js b/std/command.js
index 7d7bd33..e5d2932 100644
--- a/std/command.js
+++ b/std/command.js
@@ -41,6 +41,7 @@ playing.pl_size = 0;
 playing.size = 0;
 playing.artist = "";
 playing.album = "";
+playing.year = "";
 playing.title = "";
 playing.image = "";	// 
 playing.asin = "";	
@@ -66,6 +67,7 @@ playing.pp_button = null;
 playing.disp_artist = null;
 playing.disp_title = null; 
 playing.disp_album = null;
+playing.disp_year = null;
 playing.albumart = null;
 
 var last_pl_selected = true;
@@ -127,6 +129,7 @@ function init_player() {
 		playing.disp_artist = document.getElementById('disp_artist');
 		playing.disp_title = document.getElementById('disp_title');
 		playing.disp_album = document.getElementById('disp_album');
+		playing.disp_year = document.getElementById('disp_year');
 		playing.albumart = document.getElementById("albumart");
 		playing.pp_button = document.getElementById("pp_button");
 
@@ -412,15 +415,17 @@ function current_status_handler(info, has_plchanges) {
 	if(state!=playing.state) {
 		playing.state = state;
 		var bt = playing.pp_button;
-		if(state=="play") {
-			bt.src = IMAGE.BUTTON_PAUSE;
-			if(typeof(window.streaming_try_autoplay)=='function')
-				streaming_try_autoplay();
-		}
-		else {
-			bt.src = IMAGE.BUTTON_PLAY;
-			if(typeof(window.streaming_try_autostop)=='function')
-				streaming_try_autostop();
+		if (bt) /* we must be in read write mode to show this */ {
+			if(state=="play") {
+				bt.src = IMAGE.BUTTON_PAUSE;
+				if(typeof(window.streaming_try_autoplay)=='function')
+					streaming_try_autoplay();
+			}
+			else {
+				bt.src = IMAGE.BUTTON_PLAY;
+				if(typeof(window.streaming_try_autostop)=='function')
+					streaming_try_autostop();
+			}
 		}
 	}
 	
@@ -474,11 +479,14 @@ function request_song_info() {
 		remove_children(playing.disp_artist);
 		remove_children(playing.disp_title);
 		remove_children(playing.disp_album);
+		if(playing.disp_year)
+			remove_children(playing.disp_year);
 		if(playing.albumart)
 			remove_children(playing.albumart);
 		playing.artist = "";
 		playing.title = "";
 		playing.album = "";
+		playing.year = "";
 		playing.image = "";
 		playing.asin = "";
 		playing.length = "";
@@ -495,9 +503,11 @@ function update_current_song(info) {
 	var artist = info[ "Artist"];
 	var title = info["Title"];
 	var album = info[ "Album"];
+	var year = (info["Year"] == null) ? info["Date"] : info["Year"];
 	var a = playing.disp_artist;
 	var t = playing.disp_title;
 	var alb = playing.disp_album;
+	var y = playing.disp_year;
 	var new_thumb = false;
 
 	if(typeof(title)=='undefined')
@@ -506,6 +516,10 @@ function update_current_song(info) {
 		album = "";
 	if(typeof(artist)=='undefined')
 		artist = "";
+	if(typeof(year)=='undefined')
+		year = "";
+	else
+		year = "["+year+"]";
 
 	if(artist!=playing.artist) {
 		playing.artist = artist;
@@ -519,6 +533,12 @@ function update_current_song(info) {
 		remove_children(alb);
 		alb.appendChild(create_txt(album));
 	}
+	if((playing.year != year) && y) {
+		playing.year = year;
+		new_thumb = true;
+		remove_children(y);
+		y.appendChild(create_txt(year));
+	}
 
 	if(typeof(info['file'])!='undefined') {
 		var f = info['file'];
@@ -577,22 +597,25 @@ function buttons_init() {
 	
 	/* player control */
 	var elem = document.getElementById('pp_button');
-	elem.src = IMAGE.BUTTON_PLAY;
-	add_listener(elem, "click", send_play_pause);
-	if(window.stop_button) {
-		elem = document.getElementById('stop_button');
-		elem.style.display = "";
-		elem.src = IMAGE.BUTTON_STOP;
-		add_listener(elem, "click", send_stop_cmd);
-		elem.parentNode.style.marginLeft = "-15px";
-	}
-
-	elem = document.getElementById("next_button");
-	elem.src = IMAGE.BUTTON_NEXT;
-	add_listener(elem, "click", send_next_song);
-	elem = document.getElementById("previous_button");
-	elem.src = IMAGE.BUTTON_PREVIOUS;
-	add_listener(elem, "click", send_previous_song);
+	if (elem) /* we must be in read write mode to show these buttons */
+	{
+		elem.src = IMAGE.BUTTON_PLAY;
+		add_listener(elem, "click", send_play_pause);
+		if(window.stop_button) {
+			elem = document.getElementById('stop_button');
+			elem.style.display = "";
+			elem.src = IMAGE.BUTTON_STOP;
+			add_listener(elem, "click", send_stop_cmd);
+			elem.parentNode.style.marginLeft = "-15px";
+		}
+		
+		elem = document.getElementById("next_button");
+		elem.src = IMAGE.BUTTON_NEXT;
+		add_listener(elem, "click", send_next_song);
+		elem = document.getElementById("previous_button");
+		elem.src = IMAGE.BUTTON_PREVIOUS;
+		add_listener(elem, "click", send_previous_song);
+	}
 
 	/* left menu buttons */
 	elem = document.getElementById("open_directory_button");