From a5255484d4fe2836163a1b4c78d6b50e7c3d9245 Mon Sep 17 00:00:00 2001 From: Nick Steel Date: Mon, 9 Nov 2015 22:58:16 +0000 Subject: [PATCH] Update stream title info and restore adding radio special case. --- mopidy_musicbox_webclient/static/js/controls.js | 16 +++++++--------- mopidy_musicbox_webclient/static/js/gui.js | 3 ++- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index 76dc3e9..4535c35 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -8,6 +8,13 @@ function playBrowsedTracks(action, trackIndex) { if (typeof trackIndex === 'undefined') { trackIndex = $('#popupBrowse').data("tlid"); } + if (action == PLAY_ALL) { + mopidy.tracklist.clear(); + // Default for radio streams is to just add the selected URI. + if (isStreamUri(browseTracks[trackIndex].uri)) { + action = PLAY_NOW; + } + } var trackUris = []; switch (action) { case PLAY_NOW: @@ -16,8 +23,6 @@ function playBrowsedTracks(action, trackIndex) { trackUris.push(browseTracks[trackIndex].uri); break; case PLAY_ALL: - mopidy.tracklist.clear(); - // Don't break, fall through. case ADD_ALL_BOTTOM: trackUris = getUris(browseTracks); break; @@ -31,13 +36,6 @@ function playBrowsedTracks(action, trackIndex) { } }; - // For radio streams we just add the selected URI. - // TODO: Why? - //if (isStreamUri(trackUri)) { - //mopidy.tracklist.add(null, null, trackUri); - //return false; - //} - switch (action) { case PLAY_NOW: case PLAY_NEXT: diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index 89dd26a..14bc4d0 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -284,7 +284,8 @@ function initSocketevents() { mopidy.on("event:streamTitleChanged", function(data) { songdata.track.name = data["title"]; - setSongInfo(songdata) + console.log(songdata.track.name); + setSongInfo(songdata); }); }