fix bug: volume settings not work for initial and new songs

listen1 · May 23, 2016 · 9c2ada6 · 9c2ada6
1 parent b9b530b
commit 9c2ada6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/js/app.js b/js/app.js
@@ -482,6 +482,9 @@
           $scope.volume = 90;
           $scope.saveLocalSettings();
         }
+        else {
+          angularPlayer.adjustVolumeSlider($scope.volume);
+        }
       }
 
       $scope.saveLocalSettings = function() {

diff --git a/js/vendor/angular-soundmanager2.js b/js/vendor/angular-soundmanager2.js
@@ -4686,6 +4686,7 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
                 if ((bootstrapTrack != null) && (isResume !== true)) {
                     var angularPlayerObj = this;
                     var sound = soundManager.getSoundById(trackId);
+                    sound.setVolume(volume);
                     bootstrapTrack(sound, this.currentTrackData(), function(){
                         soundManager.play(trackId);
                         $rootScope.$broadcast('track:id', trackId);
@@ -4879,6 +4880,7 @@ ngSoundManager.factory('angularPlayer', ['$rootScope', '$log',
                     }
                     $rootScope.$broadcast('music:volume', volume);
                 };
+                volume = value;
                 changeVolume(value);
             },
             clearPlaylist: function(callback) {