andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Consolidate common code into getNowPlayingTlid.

Browse Source
This commit is contained in:
Nick Steel 2015-04-12 18:10:09 +01:00
parent 2c946d4fdd
commit 2c2e9776b7
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -1,3 +1,15 @@
/********************************************************
* Return TrackList ID for the currently playing track.
*********************************************************/
function getNowPlayingTlid() {
for (var playing = 0; playing < currentplaylist.length; playing++) {
if (currentplaylist[playing].uri == songdata.uri) {
break;
}
}
return playing;
}
/********************************************************
* play tracks from a browse list
*********************************************************/
@ -23,12 +35,7 @@ function playBrowsedTracks(addtoqueue, trackid) {
switch (addtoqueue) {
case PLAY_NOW:
case PLAY_NEXT:
//find track that is playing
for (var playing = 0; playing < currentplaylist.length; playing++) {
if (currentplaylist[playing].uri == songdata.uri) {
break;
}
}
var playing = getNowPlayingTlid();
mopidy.tracklist.add(null, playing + 1, trackid);
break;
case ADD_THIS_BOTTOM:
@ -112,6 +119,7 @@ function playTrack(addtoqueue) {
var trackslist = new Array();
var track, tracksbefore, tracksafter;
var tracks = getTracksFromUri(playlisturi);
var playing = getNowPlayingTlid();
//find track that was selected
for (var selected = 0; selected < tracks.length; selected++) {
@ -120,13 +128,6 @@ function playTrack(addtoqueue) {
}
}
//find track that is playing
for (var playing = 0; playing < currentplaylist.length; playing++) {
if (currentplaylist[playing].tlid == songdata.tlid) {
break;
}
}
//switch popup options
switch (addtoqueue) {
case PLAY_NOW: