- 
- 
-
-
-
+
- 
- 0:00
-
- 0:00
+
@@ -143,9 +136,9 @@
+
+
+ 0:00
+
+ 0:00
+
- 
-
+
+
-
-
+
+
+
+
+ 
-
-
+
+
+
-
+ Album
- - +Album
+ +
-
+
+
Artists
@@ -205,58 +198,62 @@Albums
-
+
-
Tracks
-| Title | -Artist | -Album | -Length | -
|---|
| Title | +Artist | +Album | +Length | +
|---|
-
-
@@ -77,18 +76,18 @@ function playlisttotable(pl, table, uri) {
tmp = '';
$(table).empty();
-// console.log(pl.length);
- //console.log(pl);
- for (var i = 0; i < pl.length; i++) {
- // console.log(pl[i]);
- var child = ' ' + pl[i]["name"] + " ";
- for (var j = 0; j < pl[i]["artists"].length; j++) {
- //console.log(j);
- child += '' + pl[i]["artists"][j]["name"] + "";
- }
- child += ' ' + pl[i]["album"]["name"] + ' ' + timeFromSeconds(pl[i]["length"] / 1000) + ' ' + pl[i]["name"] + " ";
+ for (var j = 0; j < pl[i]["artists"].length; j++) {
+ //console.log(j);
+ child += '' + pl[i]["artists"][j]["name"] + "";
+ }
+ child += ' ' + pl[i]["album"]["name"] + ' ' + timeFromSeconds(pl[i]["length"] / 1000) + '
Offline
+
+
-
+
+ Offline
+
+
+ Cannot connect to the server. Please wait...
+
+
+
-
-
-
-
- Cannot connect to the server...
Please wait.
-
-
+
-
+
+ Loading data...
+
+
+ Getting data from the server. Please wait...
+
+
+ This could take a while (Too much of a while actually. Will be fixed...)
+
+
+
-
diff --git a/js/functionsvars.js b/js/functionsvars.js
index 40ce864..8b0b33d 100755
--- a/js/functionsvars.js
+++ b/js/functionsvars.js
@@ -14,7 +14,7 @@ var socket;
//values for controls
var play = false;
-var shuffle;
+var random;
var repeat;
var currentVolume = -1;
var muteVolume = -1;
@@ -46,25 +46,24 @@ SEARCH_TRACK_TABLE = '#trackresulttable';
//A hack to find the name of the first artist of a playlist. this is not yet returned by mopidy
//does not work wel with multiple artists of course
function getArtist(pl) {
- for (var i = 0; i < pl.length; i++) {
- for (var j = 0; j < pl[i]["artists"].length; j++) {
- if (pl[i]["artists"][j]["name"] != '') {
- return pl[i]["artists"][j]["name"];
- }
+ for (var i = 0; i < pl.length; i++) {
+ for (var j = 0; j < pl[i]["artists"].length; j++) {
+ if (pl[i]["artists"][j]["name"] != '') {
+ return pl[i]["artists"][j]["name"];
}
- };
+ }
+ };
}
//A hack to find the first album of a playlist. this is not yet returned by mopidy
function getAlbum(pl) {
- for (var i = 0; i < pl.length; i++) {
- if(pl[i]["album"]["name"] != '') {
- return pl[i]["album"]["name"];
- }
- };
+ for (var i = 0; i < pl.length; i++) {
+ if (pl[i]["album"]["name"] != '') {
+ return pl[i]["album"]["name"];
+ }
+ };
}
-
//process updated playlist to gui
function playlisttotable(pl, table, uri) {
/*
-
- Loading data...
-
-
-
-
- Getting data from the server...
- Please wait.
- This could take a while (Too much of a while actually. Will be fixed...)
-
-
- Donec id elit non mi porta
- Gravida at eget metus. Fusce dapibus.
- Tellus ac cursus commodo */ - if ((!resultArr) || (resultArr == '') ) { return; } + if ((!resultArr) || (resultArr == '')) { + return; + } playlists = resultArr; tmp = ''; for (var i = 0; i < playlists.length; i++) { @@ -87,8 +101,10 @@ function handleGetplaylists(resultArr) { $("#loadingmodal").modal('hide'); } -//process results of a returned playlist -function handlePlaylist(resultArr) { +/******************************************************** + * process results of a returned playlist + *********************************************************/ +function processSinglePlaylist(resultArr) { //cache newplaylisturi = resultArr["uri"]; playlists[newplaylisturi] = resultArr; @@ -96,14 +112,19 @@ function handlePlaylist(resultArr) { $('#playlistloader').hide(); } -//process results of a returned playlist -function handleCurrentPlaylist(resultArr) { +/******************************************************** + * process results of a returned playlist + *********************************************************/ +function processCurrentPlaylist(resultArr) { currentplaylist = resultArr; playlisttotable(resultArr, CURRENT_PLAYLIST_TABLE); mopidy.playback.getCurrentTrack().then(currentTrackResults, console.error); } -function handleSearchResults(resultArr) { +/******************************************************** + * process results of a search + *********************************************************/ +function processSearchResults(resultArr) { $(SEARCH_TRACK_TABLE).empty(); $(SEARCH_ARTIST_TABLE).empty(); $(SEARCH_ALBUM_TABLE).empty(); @@ -115,60 +136,54 @@ function handleSearchResults(resultArr) { var artists = resultArr[1].artists; var child = ''; - for (var i = 0; i < artists.length; i++) { - child += '