add shuffle

Gruntfile.js

@@ -29,6 +29,8 @@ 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'
         ],
         dest: 'dist/angular-soundmanager2.js'
       }

dist/angular-soundmanager2.js

@@ -4422,6 +4422,8 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
 
         var currentTrack = null,
             repeat = false,
+            shuffle = false,
+            tempTrack = [],
             autoPlay = true,
             isPlaying = false,
             volume = 90,
@@ -4620,6 +4622,7 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
                 }
                 //unload from soundManager
                 soundManager.destroySound(song);
+
                 //remove from playlist
                 playlist.splice(index, 1);
                 //once all done then broadcast
@@ -4678,16 +4681,30 @@ 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];
+                var nextTrack = useTrack[nextTrackKey];
                 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;
@@ -4700,9 +4717,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 {
@@ -4731,6 +4755,36 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
             getRepeatStatus: function() {
                 return repeat;
             },
+            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;
             },
@@ -5173,3 +5227,37 @@ 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();            
+        }
+    };
+}]);

examples/index.html

@@ -49,6 +49,10 @@ <h5>Songs</h5>
                 -
                 <button repeat-music>Repeat ({{ repeat }})</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 }}

src/03-factory-angularPlayer.js

@@ -3,6 +3,8 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
 
         var currentTrack = null,
             repeat = false,
+            shuffle = false,
+            tempTrack = [],
             autoPlay = true,
             isPlaying = false,
             volume = 90,
@@ -201,6 +203,7 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
                 }
                 //unload from soundManager
                 soundManager.destroySound(song);
+
                 //remove from playlist
                 playlist.splice(index, 1);
                 //once all done then broadcast
@@ -259,16 +262,30 @@ 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];
+                var nextTrack = useTrack[nextTrackKey];
                 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;
@@ -281,9 +298,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 {
@@ -312,6 +336,36 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
             getRepeatStatus: function() {
                 return repeat;
             },
+            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;
             },

src/21-directive-shuffleMusic.js

@@ -0,0 +1,18 @@
+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;
+                    });
+                });
+            }
+        };
+    }]);

src/22-directive-shuffleAllMusic.js

@@ -0,0 +1,13 @@
+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();            
+        }
+    };
+}]);