Merge pull request #32119 from justindarc/bug1209785

Bug 1209785 - The playlist will restart when the next song button is …
mozilla-b2g · Sep 30, 2015 · 5321c3d · 5321c3d
2 parents d9a4ad6 + 4110406
commit 5321c3d
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 13 deletions.
diff --git a/apps/music/js/app.js b/apps/music/js/app.js
@@ -52,6 +52,18 @@ var client = bridge.client({
 
 client.on('play', () => isPlaying = true);
 
+client.on('stop', () => {
+  isPlaying = false;
+
+  var isPlayerView = viewStack.activeView &&
+    viewStack.activeView.url === VIEWS.PLAYER.URL;
+
+  if (isPlayerView) {
+    viewStack.popView(true);
+    window.history.back();
+  }
+});
+
 client.on('databaseChange', () => updateOverlays());
 
 client.on('databaseUpgrade', () => upgradeOverlay.hidden = false);
@@ -104,7 +116,7 @@ header.addEventListener('action', (evt) => {
   }
 
   var isPlayerView = viewStack.activeView &&
-    viewStack.activeView.frame.src.endsWith(VIEWS.PLAYER.URL);
+    viewStack.activeView.url === VIEWS.PLAYER.URL;
 
   if (viewStack.views.length > 1) {
     // Don't destroy the popped view if it is the "Player" view.

diff --git a/apps/music/js/endpoint.js b/apps/music/js/endpoint.js
@@ -7,10 +7,11 @@ var audio = document.getElementById('audio');
 
 var loadQueueSettings = PlaybackQueue.loadSettings();
 
-var currentFilePath;
-var currentQueue;
-var isInterrupted = false;
-var isFastSeeking = false;
+var currentFilePath = null;
+var currentQueue    = null;
+var isInterrupted   = false;
+var isFastSeeking   = false;
+var isStopped       = true;
 
 var service = bridge.service('music-service')
   .method('play', play)
@@ -103,6 +104,10 @@ function play(filePath) {
   }
 
   getSongFile(filePath).then((file) => {
+    if (isStopped) {
+      return;
+    }
+
     currentFilePath = filePath;
 
     audio.src = null;
@@ -125,6 +130,20 @@ function pause() {
   audio.pause();
 }
 
+function stop() {
+  isStopped = true;
+
+  audio.pause();
+
+  currentFilePath = null;
+  currentQueue = null;
+
+  audio.src = null;
+  audio.load();
+
+  service.broadcast('stop');
+}
+
 function seek(time) {
   time = parseInt(time, 10);
   audio.currentTime = time;
@@ -165,7 +184,8 @@ function getPlaybackStatus() {
     duration:      audio.duration,
     elapsedTime:   audio.currentTime,
     isInterrupted: isInterrupted,
-    isFastSeeking: isFastSeeking
+    isFastSeeking: isFastSeeking,
+    stopped:       isStopped
   });
 }
 
@@ -192,7 +212,10 @@ function nextSong(automatic = false) {
     return Promise.reject();
   }
 
-  currentQueue.next(automatic);
+  var hasNextSong = currentQueue.next(automatic);
+  if (!hasNextSong) {
+    return Promise.resolve(stop());
+  }
 
   return currentSong().then(song => play(song.name));
 }
@@ -203,7 +226,10 @@ function queueArtist(filePath) {
       var index = songs.findIndex(song => song.name === filePath);
       currentQueue = new PlaybackQueue.StaticQueue(songs, index);
 
-      return currentSong().then(song => play(song.name));
+      return currentSong().then((song) => {
+        isStopped = false;
+        play(song.name);
+      });
     });
   });
 }
@@ -214,7 +240,10 @@ function queueAlbum(filePath) {
       var index = songs.findIndex(song => song.name === filePath);
       currentQueue = new PlaybackQueue.StaticQueue(songs, index);
 
-      return currentSong().then(song => play(song.name));
+      return currentSong().then((song) => {
+        isStopped = false;
+        play(song.name);
+      });
     });
   });
 }
@@ -229,7 +258,10 @@ function queuePlaylist(id, filePath) {
           (playlist.shuffle ? Math.floor(Math.random() * songs.length) : 0);
         currentQueue = new PlaybackQueue.StaticQueue(songs, index);
 
-        return currentSong().then(song => play(song.name));
+        return currentSong().then((song) => {
+          isStopped = false;
+          play(song.name);
+        });
       });
     });
   });
@@ -241,7 +273,10 @@ function queueSong(filePath) {
       var index = songs.findIndex(song => song.name === filePath);
       currentQueue = new PlaybackQueue.StaticQueue(songs, index);
 
-      return currentSong().then(song => play(song.name));
+      return currentSong().then((song) => {
+        isStopped = false;
+        play(song.name);
+      });
     });
   });
 }
@@ -445,6 +480,7 @@ function open(blob) {
     return AudioMetadata.parse(blob).then((metadata) => {
       var filePath = blob.name;
 
+      isStopped = false;
       play(filePath);
 
       return {

diff --git a/apps/music/js/remote.js b/apps/music/js/remote.js
@@ -4,6 +4,7 @@
 
 var Remote = (function() {
   const PLAY_STATUS_INTERRUPTED = 'mozinterruptbegin';
+  const PLAYSTATUS_STOPPED      = 'STOPPED';
   const PLAY_STATUS_PAUSED      = 'PAUSED';
   const PLAY_STATUS_PLAYING     = 'PLAYING';
 
@@ -42,8 +43,8 @@ var Remote = (function() {
     updatePlaybackStatus: function() {
       if (Remote.enabled) {
         client.method('getPlaybackStatus').then((status) => {
-          var playStatus = status.paused ?
-            PLAY_STATUS_PAUSED : PLAY_STATUS_PLAYING;
+          var playStatus = status.stopped ? PLAYSTATUS_STOPPED :
+            (status.paused ? PLAY_STATUS_PAUSED : PLAY_STATUS_PLAYING);
 
           if (status.isInterrupted) {
             playStatus = PLAY_STATUS_INTERRUPTED;
@@ -166,6 +167,7 @@ var Remote = (function() {
 
     client.on('play', Remote.updatePlaybackStatus);
     client.on('pause', Remote.updatePlaybackStatus);
+    client.on('stop', Remote.updatePlaybackStatus);
     client.on('elapsedTimeChange', Remote.updatePlaybackStatus);
     client.on('interruptBegin', Remote.updatePlaybackStatus);
     client.on('interruptEnd', Remote.updatePlaybackStatus);