Skip to content

add shuffle #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phalla-khong wants to merge 8 commits into
base: master
Choose a base branch
from
Open

add shuffle #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
20575fd
add shuffle
phalla-khong Dec 12, 2016
dc08c00
fix some bug on shuffle
phalla-khong Dec 13, 2016
c59649d
add auto play when shuffle
kimsrung Apr 12, 2017
3c42459
grunt files
kimsrung Apr 12, 2017
5766ac8
add playShuffle feature
Apr 12, 2017
4d6c6ae
fix bug on playNext
Apr 21, 2017
2c8b258
correct on playNext
Apr 21, 2017
3ff2ded
add feature repeatTrack
Apr 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ module.exports = function (grunt) {
'src/18-directive-playAll.js',
'src/19-directive-volumeBar.js',
'src/20-directive-playPauseToggle.js',
'src/21-directive-shuffleMusic.js',
'src/22-directive-shuffleAllMusic.js',
'src/23-directive-repeatTrack.js'
],
dest: 'dist/angular-soundmanager2.js'
}
Expand Down
152 changes: 146 additions & 6 deletions dist/angular-soundmanager2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4422,6 +4422,9 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',

var currentTrack = null,
repeat = false,
repeatTrack = false,
shuffle = false,
tempTrack = [],
autoPlay = true,
isPlaying = false,
volume = 90,
Expand Down Expand Up @@ -4620,6 +4623,7 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
}
//unload from soundManager
soundManager.destroySound(song);

//remove from playlist
playlist.splice(index, 1);
//once all done then broadcast
Expand Down Expand Up @@ -4678,16 +4682,32 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
$log.debug("Please click on Play before this action");
return null;
}
var currentTrackKey = this.getIndexByValue(soundManager.soundIDs, this.getCurrentTrack());

// use shuffle track list if shuffle is true
var useTrack = angular.copy(soundManager.soundIDs);
if(shuffle === true){
useTrack = tempTrack;
}

var currentTrackKey = this.getIndexByValue(useTrack, this.getCurrentTrack());
var nextTrackKey = +currentTrackKey + 1;
var nextTrack = soundManager.soundIDs[nextTrackKey];
if(typeof nextTrack !== 'undefined') {
var nextTrack = useTrack[nextTrackKey];
if(repeatTrack === true) {
this.playTrack(useTrack[currentTrackKey]);
} else if(typeof nextTrack !== 'undefined') {
this.playTrack(nextTrack);
} else {
// generate shuffle track list
if(shuffle === true && isPlaying === true){
tempTrack = angular.copy(soundManager.soundIDs);
tempTrack = (tempTrack).sort(function() { return 0.5 - Math.random(); });
$rootScope.$broadcast('music:tempTrack', tempTrack);
}

//if no next track found
if(repeat === true) {
//start first track if repeat is on
this.playTrack(soundManager.soundIDs[0]);
this.playTrack(useTrack[0]);
} else {
//breadcase not playing anything
isPlaying = false;
Expand All @@ -4700,9 +4720,16 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
$log.debug("Please click on Play before this action");
return null;
}
var currentTrackKey = this.getIndexByValue(soundManager.soundIDs, this.getCurrentTrack());

// use shuffle track list if shuffle is true
var useTrack = angular.copy(soundManager.soundIDs);
if(shuffle === true){
useTrack = tempTrack;
}

var currentTrackKey = this.getIndexByValue(useTrack, this.getCurrentTrack());
var prevTrackKey = +currentTrackKey - 1;
var prevTrack = soundManager.soundIDs[prevTrackKey];
var prevTrack = useTrack[prevTrackKey];
if(typeof prevTrack !== 'undefined') {
this.playTrack(prevTrack);
} else {
Expand All @@ -4725,12 +4752,57 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
repeat = false;
} else {
repeat = true;
repeatTrack = false;
$rootScope.$broadcast('music:repeatTrack', repeatTrack);
}
$rootScope.$broadcast('music:repeat', repeat);
},
getRepeatStatus: function() {
return repeat;
},
repeatTrackToggle: function() {
if(repeatTrack === true) {
repeatTrack = false;
} else {
repeatTrack = true;
repeat = false;
$rootScope.$broadcast('music:repeat', repeat);
}
$rootScope.$broadcast('music:repeatTrack', repeatTrack);
},
getRepeatTrackStatus: function() {
return repeatTrack;
},
shuffleToggle: function() {
if(shuffle === true) {
shuffle = false;
tempTrack = angular.copy(soundManager.soundIDs);
} else {
shuffle = true;
tempTrack = angular.copy(soundManager.soundIDs);
tempTrack = (tempTrack).sort(function() { return 0.5 - Math.random(); });
}
$rootScope.$broadcast('music:shuffle', shuffle);
$rootScope.$broadcast('music:tempTrack', tempTrack);
},
getShuffleStatus: function() {
return shuffle;
},
playShuffle: function(){
var trackToPlay = null;
shuffle = true;
tempTrack = angular.copy(soundManager.soundIDs);
tempTrack = (tempTrack).sort(function() { return 0.5 - Math.random(); });
$rootScope.$broadcast('music:shuffle', shuffle);
$rootScope.$broadcast('music:tempTrack', tempTrack);

if(tempTrack.length === 0) {
$log.debug('playlist is empty!');
return;
}
trackToPlay = tempTrack[0];
this.initPlayTrack(trackToPlay);
},
getVolume: function() {
return volume;
},
Expand Down Expand Up @@ -4795,6 +4867,18 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
},
isPlayingStatus: function() {
return isPlaying;
},
isLastTrack: function() {
// use shuffle track list if shuffle is true
var useTrack = angular.copy(soundManager.soundIDs);
if(shuffle === true){
useTrack = tempTrack;
}
var currentTrackKey = this.getIndexByValue(useTrack, this.getCurrentTrack());
if(repeat === false && (this.getPlaylist()).length == currentTrackKey+1 ) {
return true;
}
return false;
}
};
}
Expand Down Expand Up @@ -4975,6 +5059,9 @@ ngSoundManager.directive('nextTrack', ['angularPlayer', function (angularPlayer)
link: function (scope, element, attrs) {

element.bind('click', function (event) {
if( angularPlayer.isLastTrack() && angularPlayer.isPlayingStatus() ){
return false;
}
angularPlayer.nextTrack();
});

Expand Down Expand Up @@ -5173,3 +5260,56 @@ ngSoundManager.directive('playPauseToggle', ['angularPlayer',
};
}
]);


ngSoundManager.directive('shuffleMusic', ['angularPlayer', function (angularPlayer) {
return {
restrict: "EA",
link: function (scope, element, attrs) {

element.bind('click', function (event) {
angularPlayer.shuffleToggle();
});

scope.shuffle = angularPlayer.getShuffleStatus();
scope.$on('music:shuffle', function (event, data) {
scope.$apply(function () {
scope.shuffle = data;
});
});
}
};
}]);

ngSoundManager.directive('shuffleAllMusic', ['angularPlayer', function (angularPlayer) {
return {
restrict: "EA",
link: function (scope, element, attrs) {

element.bind('click', function (event) {
angularPlayer.playShuffle();
});

scope.shuffle = angularPlayer.getShuffleStatus();
}
};
}]);

ngSoundManager.directive('repeatTrack', ['angularPlayer', function (angularPlayer) {
return {
restrict: "EA",
link: function (scope, element, attrs) {

element.bind('click', function (event) {
angularPlayer.repeatTrackToggle();
});

scope.repeatTrack = angularPlayer.getRepeatTrackStatus();
scope.$on('music:repeatTrack', function (event, data) {
scope.$apply(function () {
scope.repeatTrack = data;
});
});
}
};
}]);
6 changes: 3 additions & 3 deletions dist/angular-soundmanager2.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ <h5>Songs</h5>
-
<button repeat-music>Repeat ({{ repeat }})</button>
-
<button repeat-track>Repeat track ({{ repeatTrack }})</button>
-
<button shuffle-music>Shuffle ({{ shuffle }})</button>
-
<button shuffle-all-music>Play Shuffle ({{ shuffle }})</button>
-
<button play-pause-toggle data-play="Play!" data-pause="Pause!">Play Toggle</button>

Is Playing: {{ isPlaying }}
Expand Down
96 changes: 90 additions & 6 deletions src/03-factory-angularPlayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',

var currentTrack = null,
repeat = false,
repeatTrack = false,
shuffle = false,
tempTrack = [],
autoPlay = true,
isPlaying = false,
volume = 90,
Expand Down Expand Up @@ -201,6 +204,7 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
}
//unload from soundManager
soundManager.destroySound(song);

//remove from playlist
playlist.splice(index, 1);
//once all done then broadcast
Expand Down Expand Up @@ -259,16 +263,32 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
$log.debug("Please click on Play before this action");
return null;
}
var currentTrackKey = this.getIndexByValue(soundManager.soundIDs, this.getCurrentTrack());

// use shuffle track list if shuffle is true
var useTrack = angular.copy(soundManager.soundIDs);
if(shuffle === true){
useTrack = tempTrack;
}

var currentTrackKey = this.getIndexByValue(useTrack, this.getCurrentTrack());
var nextTrackKey = +currentTrackKey + 1;
var nextTrack = soundManager.soundIDs[nextTrackKey];
if(typeof nextTrack !== 'undefined') {
var nextTrack = useTrack[nextTrackKey];
if(repeatTrack === true) {
this.playTrack(useTrack[currentTrackKey]);
} else if(typeof nextTrack !== 'undefined') {
this.playTrack(nextTrack);
} else {
// generate shuffle track list
if(shuffle === true && isPlaying === true){
tempTrack = angular.copy(soundManager.soundIDs);
tempTrack = (tempTrack).sort(function() { return 0.5 - Math.random(); });

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

$rootScope.$broadcast('music:tempTrack', tempTrack);
}

//if no next track found
if(repeat === true) {
//start first track if repeat is on
this.playTrack(soundManager.soundIDs[0]);
this.playTrack(useTrack[0]);
} else {
//breadcase not playing anything
isPlaying = false;
Expand All @@ -281,9 +301,16 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
$log.debug("Please click on Play before this action");
return null;
}
var currentTrackKey = this.getIndexByValue(soundManager.soundIDs, this.getCurrentTrack());

// use shuffle track list if shuffle is true
var useTrack = angular.copy(soundManager.soundIDs);
if(shuffle === true){
useTrack = tempTrack;
}

var currentTrackKey = this.getIndexByValue(useTrack, this.getCurrentTrack());

@houndci-bot houndci-bot Dec 13, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Dec 13, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Dec 13, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

var prevTrackKey = +currentTrackKey - 1;
var prevTrack = soundManager.soundIDs[prevTrackKey];
var prevTrack = useTrack[prevTrackKey];
if(typeof prevTrack !== 'undefined') {
this.playTrack(prevTrack);
} else {
Expand All @@ -306,12 +333,57 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
repeat = false;
} else {
repeat = true;
repeatTrack = false;
$rootScope.$broadcast('music:repeatTrack', repeatTrack);
}
$rootScope.$broadcast('music:repeat', repeat);
},
getRepeatStatus: function() {
return repeat;
},
repeatTrackToggle: function() {
if(repeatTrack === true) {
repeatTrack = false;
} else {
repeatTrack = true;
repeat = false;
$rootScope.$broadcast('music:repeat', repeat);
}
$rootScope.$broadcast('music:repeatTrack', repeatTrack);
},
getRepeatTrackStatus: function() {
return repeatTrack;
},
shuffleToggle: function() {
if(shuffle === true) {
shuffle = false;
tempTrack = angular.copy(soundManager.soundIDs);
} else {
shuffle = true;
tempTrack = angular.copy(soundManager.soundIDs);
tempTrack = (tempTrack).sort(function() { return 0.5 - Math.random(); });

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

}
$rootScope.$broadcast('music:shuffle', shuffle);
$rootScope.$broadcast('music:tempTrack', tempTrack);
},
getShuffleStatus: function() {
return shuffle;
},
playShuffle: function(){
var trackToPlay = null;
shuffle = true;
tempTrack = angular.copy(soundManager.soundIDs);
tempTrack = (tempTrack).sort(function() { return 0.5 - Math.random(); });

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

@houndci-bot houndci-bot Apr 12, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line is too long.

$rootScope.$broadcast('music:shuffle', shuffle);
$rootScope.$broadcast('music:tempTrack', tempTrack);

if(tempTrack.length === 0) {
$log.debug('playlist is empty!');
return;
}
trackToPlay = tempTrack[0];
this.initPlayTrack(trackToPlay);
},
getVolume: function() {
return volume;
},
Expand Down Expand Up @@ -376,6 +448,18 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
},
isPlayingStatus: function() {
return isPlaying;
},
isLastTrack: function() {
// use shuffle track list if shuffle is true
var useTrack = angular.copy(soundManager.soundIDs);
if(shuffle === true){
useTrack = tempTrack;
}
var currentTrackKey = this.getIndexByValue(useTrack, this.getCurrentTrack());
if(repeat === false && (this.getPlaylist()).length == currentTrackKey+1 ) {
return true;
}
return false;
}
};
}
Expand Down
Loading