X-Git-Url: https://git.wh0rd.org/?p=chrome-ext%2Fmusic-player-client.git;a=blobdiff_plain;f=main.js;h=88c146f850c6c271ff2caafa0aeb907282b779a7;hp=7e12e9fe4948b04d5d10b512e84475bd252753d8;hb=3903477400d2618c07543eba122ab794dac8fb5a;hpb=0c6612195aad9b50879223c510e47df0725ec6d4

diff --git a/main.js b/main.js
index 7e12e9f..88c146f 100644
--- a/main.js
+++ b/main.js
@@ -11,6 +11,9 @@ function TcpClientSender(tcpclient) {
 TcpClientSender.prototype.send = function(data, cb) {
 	this.tcpclient.sendMessage(data, cb);
 }
+TcpClientSender.prototype.poll = function() {
+	this.tcpclient.poll();
+}
 
 function tramp_mpc_recv(data) {
 	mpc.recv(data);
@@ -79,6 +82,8 @@ function mpc_connect(host, port) {
 		tcpclient.addResponseListener(tramp_mpc_recv);
 		mpc = new Mpc(mpc_sender, update_ui);
 		console.log('connected to ' + host + ':' + port);
+		console.log('protip: use the "mpc" object to poke mpd directly.\n' +
+		            'you can also do mpc.set_debug(3) to see traffic');
 		mpc_refresh();
 		update_refresh_timer();
 	});
@@ -151,7 +156,7 @@ function do_refresh() {
 }
 
 function update_refresh_timer() {
-	if (refresh_id != NaN)
+	if (!isNaN(refresh_id))
 		window.clearTimeout(refresh_id);
 	var rate = window['opts_refresh'].value * 1000;
 	if (rate > 0)
@@ -187,16 +192,22 @@ function init_ui(local_keys, sync_keys, options) {
 
 	/* Setup control tab */
 	ui_mpc_status = document.getElementById('status');
-	ui_mpc_metadata = document.getElementById('metadata');
 	[
 		'consume', 'next', 'pause', 'play', 'previous', 'random', 'repeat',
 		'seekcur', 'setvol', 'single', 'stop',
 	].forEach(function(id) {
 		var ele = window['ui_mpc_' + id] = document.getElementById(id);
-		ele.onclick = window['tramp_mpc_' + id];
+		ele.onchange = ele.onclick = window['tramp_mpc_' + id];
 		ele.title = id;
 	});
 
+	/* Setup metadata tab */
+	[
+		'album', 'artist', 'date', 'file', 'title',
+	].forEach(function(id) {
+		window['ui_mpc_metadata_' + id] = document.getElementById('metadata.' + id);
+	});
+
 	/* Setup options tab */
 	document.getElementById('connect').onclick = mpc_connect;
 	local_keys.forEach(function(id) {
@@ -233,17 +244,27 @@ function update_ui(state, cmd) {
 		return;
 	}
 
-	if ('file' in state) {
-		// Hack: should be a real object.
-		ui_mpc_metadata.innerText = state['file'];
-		return;
-	}
+	// Hack: should be a real object.
+	ui_mpc_metadata_album.innerText = state.Album;
+	ui_mpc_metadata_artist.innerText = state.Artist;
+	ui_mpc_metadata_title.innerText = state.Title;
+	ui_mpc_metadata_date.innerText = state.Date;
+	ui_mpc_metadata_file.innerText = state.file;
+
+	var time;
+	if ('time' in state)
+		// When stopped, there is no time field at all.
+		time = state.time.split(':');
+	else
+		time = [0, 0];
+	window.ui_mpc_seekcur.max = time[1];
+	window.ui_mpc_seekcur.value = time[0];
+	percent = Math.floor((0.0 + time[0]) * 100 / (0.0 + time[1]));
+	window.ui_mpc_seekcur.title = 'seekcur (' + percent + '%)';
 
-	var time = state.time.split(':');
-	window['ui_mpc_seekcur'].max = time[1];
-	window['ui_mpc_seekcur'].value = time[0];
+	window.ui_mpc_setvol.value = state.volume;
+	window.ui_mpc_setvol.title = 'setvol (' + state.volume + '%)';
 
-	window['ui_mpc_setvol'].value = state.volume;
 	[
 		'consume', 'random', 'repeat', 'single',
 	].forEach(function(id) {