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

Adds more methods to control the queue in the player service.

Browse source 
- Adds : empty queue, shuffle queue, add one song to queue, remove one song from queue, restart the current song
- Removes the "playEnded" method : we now use correctly scope.$apply() in the directive after calling nextTrack(). The next song is correctly called after the end of the current one.
- Starts replacing the old rootScope functions with calls to the player service.
This commit is contained in:
Hyzual 2014-12-21 10:26:29 +01:00
parent f4afa67598
commit 7074e9abc8
8 changed files with 145 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/common/main-controller.js
View file

@ -353,6 +353,7 @@
});
};
$scope.queueEmpty = function () {
//TODO: Hyz: Remove
//self.selectedSongs([]);
$rootScope.queue = [];
$.fancybox.close();
@ -369,6 +370,7 @@
}
};
$scope.queueShuffle = function () {
//TODO: Hyz: Remove
$rootScope.queue.sort(function () { return 0.5 - Math.random(); });
};
$scope.selectedSongs = [];

3
app/index.html
View file

@ -12,7 +12,7 @@
<link rel="icon" href="images/favicon_32x32.png" sizes="32x32"/>
<!-- build:css(.) styles/vendor.min.css -->
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/jplayer/skin/pink.flag/jplayer.pink.flag.css" />
<link rel="stylesheet" href="bower_components/jplayer/dist/skin/pink.flag/jplayer.pink.flag.css" />
<link rel="stylesheet" href="bower_components/fancybox/source/jquery.fancybox.css" />
<!-- endbower -->
<!-- endbuild -->
@ -51,6 +51,7 @@
</div><!-- end #content -->
<div id="SideBar" ng-controller="QueueController">
<div class="headeractions">
<a ng-click="player.restart()">Restart</a>
<a class="buttonimg" title="Shuffle Queue" ng-click="queueShuffle()"><img src="images/fork_gd_11x12.png"></a>
<a class="buttonimg" id="action_Empty" title="Delete Queue" ng-click="queueEmpty()"><img src="images/trash_fill_gd_12x12.png"></a>
<a class="buttonimg" id="action_DeleteSelected" title="Remove Selected From Queue" ng-click="queueRemoveSelected()"><img src="images/x_11x11.png"></a>

18
app/player/player-directive.js
View file

@ -18,7 +18,7 @@ angular.module('jamstash.player.directive', ['jamstash.settings'])
$player.jPlayer({
// Flash fallback for outdated browser not supporting HTML5 audio/video tags
// http://jplayer.org/download/
swfPath: 'bower_components/jplayer/jquery.jplayer/Jplayer.swf',
swfPath: 'bower_components/jplayer/dist/jplayer/jquery.jplayer.swf',
wmode: 'window',
solution: audioSolution,
supplied: 'mp3',
@ -35,9 +35,6 @@ angular.module('jamstash.player.directive', ['jamstash.settings'])
currentTime: '#played',
duration: '#duration'
},
ready: function() {
//Do nothing
},
play: function() {
console.log('jplayer play');
$('#playermiddle').css('visibility', 'visible');
@ -48,7 +45,8 @@ angular.module('jamstash.player.directive', ['jamstash.settings'])
},
ended: function() {
console.log('jplayer ended');
playerService.playEnded();
playerService.nextTrack();
scope.$apply();
}
});
};
@ -62,6 +60,16 @@ angular.module('jamstash.player.directive', ['jamstash.settings'])
$player.jPlayer('setMedia', {'mp3': newVal.url})
.jPlayer('play');
});
scope.$watch(function () {
return playerService.restartSong;
}, function (newVal) {
if(newVal === true) {
console.log('restartSong changed !');
$player.jPlayer('play', 0);
playerService.restartSong = false;
}
});
} //end link
};
}]);

52
app/player/player-service.js
View file

@ -5,31 +5,33 @@
*/
angular.module('jamstash.player.service', ['jamstash.settings', 'angular-underscore/utils'])
.factory('player', ['$rootScope', function ($rootScope) {
.factory('player', function () {
'use strict';
var player = {
queue: [],
playingIndex: -1,
playingSong: {},
restartSong: false,
play: function(song) {
console.log('player service - play()', song);
var songIndexInQueue;
// Find the song's index in the queue, if it's in there
_.find(player.queue, function(queuedSong, songIdx){
if(queuedSong.id === song.id){ songIndexInQueue = songIdx; console.log('sond Index in queue found = ', songIndexInQueue); return true; }
});
console.log('play() playingIndex', player.playingIndex);
songIndexInQueue = player.queue.indexOf(song);
player.playingIndex = (songIndexInQueue !== undefined) ? songIndexInQueue : -1;
console.log('play() playingIndex', player.playingIndex);
console.log('play() playingSong = ', player.playingSong);
if(player.playingSong === song) {
// We call restart because the playingSong hasn't changed and the directive won't
// play the song again
player.restart();
} else {
player.playingSong = song;
console.log('play() playingSong = ', player.playingSong);
}
},
playFirstSong: function () {
playFirstSong: function() {
console.log('player service - playFirstSong()');
player.playingIndex = 0;
player.play(player.queue[0]);
},
@ -40,17 +42,16 @@ angular.module('jamstash.player.service', ['jamstash.settings', 'angular-undersc
restart: function() {
console.log('player service - restart()');
player.restartSong = true;
},
nextTrack: function() {
console.log('player service - nextTrack()');
console.log('nextTrack() playingIndex = ', player.playingIndex);
if((player.playingIndex + 1) < player.queue.length) {
var nextTrack = player.queue[player.playingIndex + 1];
player.playingIndex++;
player.play(nextTrack);
}
console.log('nextTrack() playingIndex = ', player.playingIndex);
},
previousTrack: function() {
@ -64,16 +65,31 @@ angular.module('jamstash.player.service', ['jamstash.settings', 'angular-undersc
}
},
// TODO: Hyz Special nextTrack for jplayer to call at ended event
playEnded: function () {
player.nextTrack();
$rootScope.$apply();
emptyQueue: function() {
console.log('player service - emptyQueue()');
player.queue = [];
},
getPlayingSong: function () {
shuffleQueue: function() {
console.log('player service - shuffleQueue()');
player.queue = _.shuffle(player.queue);
},
addSong: function(song) {
console.log('player service - addSong()');
player.queue.push(song);
},
removeSong: function(song) {
console.log('player service - removeSong()');
var index = player.queue.indexOf(song);
player.queue.splice(index, 1);
},
getPlayingSong: function() {
return player.playingSong;
}
};
return player;
}]);
});

49
app/player/player-service_test.js
View file

@ -1,7 +1,7 @@
describe("Player service -", function() {
'use strict';
var player, firstSong, secondSong;
var player, firstSong, secondSong, thirdSong, newSong;
beforeEach(function() {
module('jamstash.player.service');
@ -25,15 +25,19 @@ describe("Player service -", function() {
artist: 'Lura Jeppsen',
album: 'dioptrical'
};
player.queue = [
firstSong,
secondSong, {
thirdSong = {
id: 574,
name: 'Celtidaceae',
artist: 'Willard Steury',
album: 'redux'
}
];
};
player.queue = [firstSong, secondSong, thirdSong];
newSong = {
id: 3573,
name: 'Tritopatores',
artist: 'Alysha Rocher',
album: 'uncombinably'
};
});
describe("when I call nextTrack", function() {
@ -109,22 +113,28 @@ describe("Player service -", function() {
it("when I play the second song, it finds its index in the playing queue and updates the playing index", function() {
player.play(secondSong);
expect(player.playingIndex).toBe(1);
});
it("when I play a song that isn't in the playing queue, the next song will be the first song of the playing queue", function() {
var newSong = {
id: 3573,
name: 'Tritopatores',
artist: 'Alysha Rocher',
album: 'uncombinably'
};
player.play(newSong);
expect(player.playingIndex).toBe(-1);
});
it("When I call emptyQueue, it empties the playing queue", function() {
player.emptyQueue();
expect(player.queue).toEqual([]);
});
it("When I add a song to the queue, it is appended to the end of the playing queue", function() {
player.addSong(newSong);
expect(player.queue).toEqual([firstSong, secondSong, thirdSong, newSong]);
});
it("When I remove the second song, the playing queue is now only the first and third song", function() {
player.removeSong(secondSong);
expect(player.queue).toEqual([firstSong, thirdSong]);
});
});
describe("Given a song", function() {
@ -156,6 +166,15 @@ describe("Player service -", function() {
expect(player.getPlayingSong()).toBe(song);
expect(song.playing).toBeTruthy();
});
it("When the song was playing and I play it again, it restarts playback", function() {
spyOn(player, "restart");
player.play(song);
player.play(song);
expect(player.restart).toHaveBeenCalled();
});
});
describe("Given that there is no song in my playing queue", function() {

20
app/queue/queue.js
View file

@ -5,16 +5,26 @@ angular.module('jamstash.queue.controller', ['jamstash.player.service'])
'use strict';
$scope.settings = globals.settings;
$scope.player = player;
//$scope.song = player.queue;
//angular.copy($rootScope.queue, $scope.song);
$scope.itemType = 'pl';
$scope.itemType = 'pl'; // TODO: Hyz: What is this ?
$scope.playSong = function (song) {
console.log('Queue Controller - playSong()', song);
player.play(song);
};
$scope.queueEmpty = function () {
player.queue = [];
$scope.queueEmpty = function() {
player.emptyQueue();
};
$scope.queueShuffle = function() {
player.shuffleQueue();
};
$scope.addSongToQueue = function(song) {
player.addSong(song);
};
$scope.removeSongFromQueue = function(song) {
player.removeSong(song);
};
}]);

54
app/queue/queue_test.js
View file

@ -2,6 +2,9 @@ describe("Queue controller", function() {
'use strict';
var player, scope, globals;
var song = {
id: 7310
};
beforeEach(function() {
module('jamstash.queue.controller');
@ -11,9 +14,6 @@ describe("Queue controller", function() {
globals = _globals_;
player = _player_;
// Mock the functions of the services
spyOn(player, "play");
$controller('QueueController', {
$scope: scope,
globals: globals,
@ -21,7 +21,9 @@ describe("Queue controller", function() {
});
});
});
it("When I call playSong, it calls play in the player service", function() {
spyOn(player, "play");
var songIndexInQueue = 3;
scope.playSong(songIndexInQueue);
@ -29,22 +31,40 @@ describe("Queue controller", function() {
expect(player.play).toHaveBeenCalledWith(songIndexInQueue);
});
it("When I call queueEmpty, it empties the player's queue", function() {
player.queue = [{
id: 4425,
name: 'Ratiocinator',
artist: 'Kandice Pince',
album: 'Additionally'
}, {
id: 1831,
name: 'Nonteetotaler',
artist: 'Anabel Eady',
album: 'Lyricalness'
}
];
it("When I call queueEmpty, it calls emptyQueue in the player service", function() {
spyOn(player, "emptyQueue");
scope.queueEmpty();
expect(player.queue).toEqual([]);
expect(player.emptyQueue).toHaveBeenCalled();
});
it("When I call queueShuffle, it calls shuffleQueue in the player service", function() {
spyOn(player, "shuffleQueue");
scope.queueShuffle();
expect(player.shuffleQueue).toHaveBeenCalled();
});
it("When I add one song to the queue, it calls addSong in the player service", function() {
spyOn(player, "addSong");
scope.addSongToQueue(song);
expect(player.addSong).toHaveBeenCalledWith(song);
});
xit("When I add many songs to the queue, it calls addSong in the player service", function() {
spyOn(player, "addSong");
});
it("When I remove a song from the queue, it calls removeSong in the player service", function() {
spyOn(player, "removeSong");
scope.removeSongFromQueue(song);
expect(player.removeSong).toHaveBeenCalledWith(song);
});
});

3
app/subsonic/subsonic.js
View file

@ -451,6 +451,9 @@ angular.module('jamstash.subsonic.controller', ['jamstash.subsonic.service', 'ja
$scope.playSong = function (song) {
player.play(song);
};
$scope.addSongToQueue = function(song) {
player.addSong(song);
};
/* Launch on Startup */
$scope.getArtists();