- 
+ 
- 
- 
+ 
+ 
-
+
-
-
+
+
diff --git a/webclient/js/controls.js b/webclient/js/controls.js
index 828cd1a..666de89 100644
--- a/webclient/js/controls.js
+++ b/webclient/js/controls.js
@@ -1,7 +1,7 @@
/********************************************************
* play an uri from a trackslist or the current playlist
*********************************************************/
-function playTrack() {
+function playTrack(addtobottom) {
$('#popupTracks').popup('close');
$('#controlsmodal').popup('close');
@@ -14,13 +14,19 @@ function playTrack() {
var track;
switchContent('current', uri);
var tracks = getTracksFromUri(playlisturi);
+
if (tracks) {
- mopidy.tracklist.clear();
+ if (!addtobottom) {
+ mopidy.tracklist.clear();
+ }
mopidy.tracklist.add(tracks);
$(CURRENT_PLAYLIST_TABLE).empty();
} else {
tracks = currentplaylist;
}
+
+ if (addtobottom) { return false;}
+
mopidy.playback.stop(true);
for (var i = 0; i < tracks.length; i++) {
@@ -37,8 +43,6 @@ function playTrack() {
return false;
}
-
-
/**********************
* Buttons
*/
@@ -129,6 +133,7 @@ function doRepeat() {
/*********************
* Track Slider
+ * Use a timer to prevent looping of commands
*********************/
function doSeekPos(value) {
@@ -138,20 +143,24 @@ function doSeekPos(value) {
if (!initgui) {
pauseTimer();
//set timer to not trigger it too much
- mopidy.playback.pause();
- seekTimer = setTimeout(triggerPos, 250);
+ posChanging = true;
+ seekTimer = setTimeout(triggerPos, 200);
}
}
function triggerPos() {
- console.log(newposition);
if (mopidy) {
+ mopidy.playback.stop();
mopidy.playback.seek(newposition);
mopidy.playback.resume();
+ posChanging = false;
}
}
function setPosition(pos) {
+ if (posChanging) {
+ return;
+ }
var oldval = initgui;
if (pos > songlength) {
pos = songlength;
@@ -165,11 +174,13 @@ function setPosition(pos) {
}
/********************
- * Volume
+ * Volume slider
+ * Use a timer to prevent looping of commands
*/
function setVolume(value) {
var oldval = initgui;
+ console.log('volume: ' + value);
initgui = true;
$("#volumeslider").val(value).slider('refresh');
initgui = oldval;
@@ -177,11 +188,17 @@ function setVolume(value) {
function doVolume(value) {
if (!initgui) {
- console.log('volume: ' + value);
+ volumeChanging = true;
+ clearInterval(volumeTimer);
+ volumeTimer = setTimeout(triggerVolume, 2000);
mopidy.playback.setVolume(parseInt(value));
}
}
+function triggerVolume() {
+ volumeChanging = false;
+}
+
function doMute() {
//only emit the event, not the status
if (muteVolume == -1) {
@@ -195,8 +212,9 @@ function doMute() {
}
}
+
/*******
- * Track timer
+ * Track timer
*/
//timer function to update interface
@@ -213,7 +231,7 @@ function resumeTimer() {
function initTimer() {
pauseTimer();
- // setPosition(0);
+ // setPosition(0);
resumeTimer();
}
@@ -221,5 +239,3 @@ function pauseTimer() {
clearInterval(posTimer);
}
-
-
diff --git a/webclient/js/functionsvars.js b/webclient/js/functionsvars.js
index 953d596..93b0475 100755
--- a/webclient/js/functionsvars.js
+++ b/webclient/js/functionsvars.js
@@ -18,7 +18,11 @@ var random;
var repeat;
var currentVolume = -1;
var muteVolume = -1;
+var volumeChanging = false;
+var posChanging = false;
+
var posTimer;
+var volumeTimer;
var seekTimer;
var initgui = true;
var currentpos = 0;
@@ -54,13 +58,12 @@ TRACK_TIMER = 1000;
//check status timer, every 5 or 10 sec
STATUS_TIMER = 10000;
-
/*******
*
*/
function scrollToTop() {
var divtop = 0;
-// console.log(divtop);
+ // console.log(divtop);
$('body,html').animate({
scrollTop : divtop
}, 250);
@@ -87,6 +90,84 @@ function getAlbum(pl) {
};
}
+/********************************************************
+ * break up results and put them in album tables
+ *********************************************************/
+function albumTracksToTable(pl, table, uri) {
+ var tmp = '';
+ $(table).empty();
+ var child = '';
+ for (var i = 0; i < pl.length; i++) {
+ popupData[pl[i].uri] = pl[i];
+ child = '' + timeFromSeconds(pl[i].length / 1000) + '
' + results[i].album.name + '
'; + for (j = 0; j < results[i].album.artists.length; j++) { + html += results[i].album.artists[j].name; + html += (j == results[i].album.artists.length - 1) ? '' : ' / '; + //stop after 3 + if (j > 2) { + child += '...'; + break; + } + } + html += '
' + timeFromSeconds(newalbum[j].length / 1000) + '
' + pl[i].album.name + '
'; + // child += '' + pl[i].album.name + '
'; child += ''; tmp += child; }; @@ -139,30 +220,7 @@ function playlisttotable(pl, table, uri) { $(table).attr('data', uri); //create (for new tables) -// $(table).listview().trigger("create"); - //refresh - $(table).listview('refresh'); -} - -function albumtrackstotable(pl, table, uri) { - var tmp = ''; - $(table).empty(); - var child = ''; - for (var i = 0; i < pl.length; i++) { - popupData[pl[i].uri] = pl[i]; - child = '' + timeFromSeconds(pl[i].length / 1000) + - '