X-Git-Url: https://git.wh0rd.org/?p=chrome-ext%2Fmusic-player-client.git;a=blobdiff_plain;f=main.js;h=1466bded59d7192b0a094b2c4bea70254d47cb39;hp=9902b935d01e7042570268c13be9d07b82f337c1;hb=650b9e7b55fa66426318c67b20f6c0cf82faac27;hpb=9cb957ede33364c6ba1b19529050a24cd2aa8f5f

diff --git a/main.js b/main.js
index 9902b93..1466bde 100644
--- a/main.js
+++ b/main.js
@@ -14,6 +14,10 @@ TcpClientSender.prototype.send = function(data, cb) {
 TcpClientSender.prototype.poll = function() {
 	this.tcpclient.poll();
 }
+TcpClientSender.prototype.reconnect = function() {
+	this.tcpclient.disconnect();
+	this.tcpclient.connect();
+}
 
 function tramp_mpc_recv(data) {
 	mpc.recv(data);
@@ -274,10 +278,15 @@ function pretty_time(time) {
 }
 
 function playlist_del() {
-	mpc.deleteid(this.title);
+	mpc.deleteid(this.song_id);
 	this.parentNode.remove();
 }
 
+function playlist_play() {
+	mpc.playid(this.song_id);
+	this.parentNode.style.fontWeight = 'bold';
+}
+
 function update_ui(state, cmd) {
 	if (typeof(state) == 'string') {
 		ui_mpc_status.innerText = ({
@@ -300,63 +309,78 @@ function update_ui(state, cmd) {
 		return;
 	}
 
-	/* Update the metadata tab. */
-	var currentsong = {};
-	if ('Currentsong' in state)
+	/* Update the metadata tab only when things have changed. */
+	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.title = song.Id;
-		cell.onclick = playlist_del;
-
-		cell = row.insertCell(-1);
-		cell.innerText = song.Pos;
-		cell.style.textAlign = 'right';
-
-		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;
+		if (ui_mpc_metadata_file.lastUpdate != state.Currentsong.lastUpdate) {
+			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;
 		}
-		row.insertCell(-1).innerText = pretty_time(song.Time);
-	});
+	}
+
+	/* 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 (currentsong && 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 {
+				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',