X-Git-Url: https://git.wh0rd.org/?p=chrome-ext%2Fmusic-player-client.git;a=blobdiff_plain;f=main.js;h=a5bf7841f730014dac609bb68e3145552b829e82;hp=5b05cee5e2c101192829762c3b542f40b49f9d86;hb=3a55dda47c0031b6706d1b1c45092c7766047da4;hpb=8d64e317943a529b96a15d4d12f0af368a92e043

diff --git a/main.js b/main.js
index 5b05cee..a5bf784 100644
--- a/main.js
+++ b/main.js
@@ -309,67 +309,75 @@ function update_ui(state, cmd) {
 		return;
 	}
 
-	/* Update the metadata tab. */
-	var currentsong = {};
-	if ('Currentsong' in state)
-		currentsong = state.Currentsong;
-	ui_mpc_metadata_album.innerText = currentsong.Album;
-	ui_mpc_metadata_artist.innerText = currentsong.Artist;
-	ui_mpc_metadata_title.innerText = currentsong.Title;
-	ui_mpc_metadata_date.innerText = currentsong.Date;
-	ui_mpc_metadata_file.innerText = currentsong.file;
-
-	/* Update the playlist tab. */
-	var playlist = [];
-	if ('Playlist' in state)
-		playlist = state.Playlist;
-	ui_mpc_playlist.innerHTML = '';
-	playlist.forEach(function(song) {
-		var cell, row = ui_mpc_playlist.insertRow(-1);
-		if (song.Pos == currentsong.Pos)
-			row.style.fontWeight = 'bold';
-
-		cell = row.insertCell(-1);
-		cell.id = 'playlist_del';
-		cell.innerHTML = '¤';
-		cell.song_id = song.Id;
-		cell.title = 'delete';
-		cell.onclick = playlist_del;
-
-		cell = row.insertCell(-1);
-		cell.innerText = song.Pos;
-		cell.style.textAlign = 'right';
-		cell.song_id = song.Id;
-		cell.title = 'play';
-		cell.onclick = playlist_play;
-
-		if ('Artist' in song) {
-			row.insertCell(-1).innerText = song.Artist;
-			row.insertCell(-1).innerText = song.Album;
-			row.insertCell(-1).innerText = song.Title;
-		} else {
+	/* Update the metadata tab only when things have changed. */
+	if ('Currentsong' in state && ui_mpc_metadata_file.lastUpdate != state.Currentsong.lastUpdate) {
+		var currentsong = state.Currentsong;
+		ui_mpc_metadata_album.innerText = currentsong.Album;
+		ui_mpc_metadata_artist.innerText = currentsong.Artist;
+		ui_mpc_metadata_title.innerText = currentsong.Title;
+		ui_mpc_metadata_date.innerText = currentsong.Date;
+		ui_mpc_metadata_file.innerText = currentsong.file;
+	}
+
+	/* Update the playlist tab only when things have changed. */
+	if ('Playlist' in state && ui_mpc_playlist.lastUpdate != state.Playlist.lastUpdate) {
+		var playlist = state.Playlist;
+
+		ui_mpc_playlist.innerHTML = '';
+		playlist.forEach(function(song) {
+			var cell, row = ui_mpc_playlist.insertRow(-1);
+			if (song.Pos == currentsong.Pos)
+				row.style.fontWeight = 'bold';
+
 			cell = row.insertCell(-1);
-			cell.innerText = song.file;
-			cell.colSpan = 3;
-		}
-		row.insertCell(-1).innerText = pretty_time(song.Time);
-	});
+			cell.id = 'playlist_del';
+			cell.innerHTML = '¤';
+			cell.song_id = song.Id;
+			cell.title = 'delete';
+			cell.onclick = playlist_del;
+
+			cell = row.insertCell(-1);
+			cell.innerText = song.Pos;
+			cell.style.textAlign = 'right';
+			cell.song_id = song.Id;
+			cell.title = 'play';
+			cell.onclick = playlist_play;
+
+			if ('Artist' in song) {
+				row.insertCell(-1).innerText = song.Artist;
+				row.insertCell(-1).innerText = song.Album;
+				row.insertCell(-1).innerText = song.Title;
+			} else {
+				cell = row.insertCell(-1);
+				cell.innerText = song.file;
+				cell.colSpan = 3;
+			}
+			row.insertCell(-1).innerText = pretty_time(song.Time);
+		});
+
+		ui_mpc_playlist.lastUpdate = playlist.lastUpdate;
+	}
 
 	/* Update the status tab. */
-	var time;
-	if ('time' in state)
+	var time, percent;
+	if ('time' in state) {
 		// When stopped, there is no time field at all.
 		time = state.time.split(':');
-	else
+		percent = Math.floor((0.0 + time[0]) * 100 / (0.0 + time[1]));
+	} else {
 		time = [0, 0];
+		percent = 0;
+	}
 	ui_mpc_seekcur.max = time[1];
 	ui_mpc_seekcur.value = time[0];
-	percent = Math.floor((0.0 + time[0]) * 100 / (0.0 + time[1]));
 	ui_mpc_seekcur.title = 'seekcur (' + percent + '%)';
 	ui_mpc_currtime.innerText = [pretty_time(time[0]), pretty_time(time[1]), percent + '%'].join(' / ');
 
-	ui_mpc_setvol.value = state.volume;
-	ui_mpc_setvol.title = 'setvol (' + state.volume + '%)';
+	ui_mpc_setvol.title = 'setvol';
+	if ('volume' in state) {
+		ui_mpc_setvol.value = state.volume;
+		ui_mpc_setvol.title += ' (' + state.volume + '%)';
+	}
 
 	[
 		'consume', 'random', 'repeat', 'single',