tcp-client: allow caller to force pulling of more data

[chrome-ext/music-player-client.git] / main.js

diff --git a/main.js b/main.js
index 7e12e9fe4948b04d5d10b512e84475bd252753d8..b83e0a219739a85ff931f8129635815c3eb3b533 100644 (file)
--- 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)
@@ -193,7 +198,7 @@ function init_ui(local_keys, sync_keys, options) {
                '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;
        });
 
@@ -235,15 +240,23 @@ function update_ui(state, cmd) {
 
        if ('file' in state) {
                // Hack: should be a real object.
-               ui_mpc_metadata.innerText = state['file'];
-               return;
+               ui_mpc_metadata.innerText = state.file;
        }
 
-       var time = state.time.split(':');
-       window['ui_mpc_seekcur'].max = time[1];
-       window['ui_mpc_seekcur'].value = time[0];
+       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 + '%)';
+
+       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) {