yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

3.1.1 sway.fm fixed, multiple sub-folder fix

Browse source
This commit is contained in:
Trevor Squillario 2013-11-01 07:31:43 -04:00
parent 89684032ce
commit 4b116d0024
37 changed files with 1629 additions and 530 deletions
Download patch file Download diff file Expand all files Collapse all files

30
js/player.js
View file

@ -117,7 +117,7 @@
$rootScope.queue = items;
if ($rootScope.queue.length > 0) {
//$('body').layout().open('south');
notifications.updateMessage($rootScope.queue.length + ' Song(s) Loaded to Queue', true);
notifications.updateMessage($rootScope.queue.length + ' Saved Song(s)', true);
}
if (globals.settings.Debug) { console.log('Play Queue Loaded From localStorage: ' + $rootScope.queue.length + ' song(s)'); }
}
@ -159,6 +159,20 @@
$('#songdetails').css('visibility', 'visible');
$rootScope.loadjPlayer(player1, url, suffix, loadonly, position);
if (!loadonly) {
// Sway.fm UnityShim
var playerState = {
playing: true,
title: title,
artist: artist,
favorite: false,
albumArt: coverartfull
}
if ($rootScope.unity) {
$rootScope.unity.sendState(playerState);
}
// End UnityShim
}
$('#Queue').stop().scrollTo('#' + id, 400);
$('#QueuePreviewList').stop().scrollTo('#' + id, 400);
var spechtml = '';
@ -240,18 +254,6 @@
}
if (!loadonly) { // Start playing
$(this).jPlayer("play");
/* Uncomment to enable Unity shim
var playerState = {
playing: true,
title: title,
artist: artist,
favorite: false,
albumArt: coverartFullSrc
}
if (unity) {
unity.sendState(playerState);
}
*/
} else { // Loadonly
//$('#' + songid).addClass('playing');
$(this).jPlayer("pause", position);
@ -287,7 +289,7 @@
var next = $rootScope.queue[0];
$rootScope.playSong(false, next);
} else if (globals.settings.AutoPlay) { // Load more tracks if enabled
$scope.getRandomSongs('play', '', '');
$rootScope.getRandomSongs('play', '', '');
notifications.updateMessage('Auto Play Activated...', true);
}
} else {