fix bug when playnext

lucbu · Apr 19, 2017 · 886962d · 886962d
1 parent 30e70b7
commit 886962d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/player/Player.js b/player/Player.js
@@ -14,7 +14,7 @@ Player.prototype.playSound = function(sound, cb) {
       console.log('Start music "' + sound.title + '"');
       player.status = 'onair';
       console.log(sound.filename)
-      player.audio = spawn('vlc', [sound.filename, '--intf="dummy"', '--play-and-exit']);
+      player.audio = spawn('vlc', [sound.filename, '--intf' ,'dummy', '--play-and-exit']);
       player.audio.on('exit', function(code){
           console.log('End music ' + sound.filename);
           player.status = 'offair'

diff --git a/playlist/Playlist.js b/playlist/Playlist.js
@@ -21,7 +21,6 @@ Playlist.prototype.playNext = function(force){
         force=false;
     }
     if(force){
-        this.queue.shift();
         var isWin = /^win/.test(os.platform());
         if(!isWin) {
             this.player.audio.kill('SIGKILL');
@@ -30,28 +29,28 @@ Playlist.prototype.playNext = function(force){
             cp.exec('taskkill /PID ' + this.player.audio.pid + ' /T /F', function (error, stdout, stderr) {});
         }
         this.player.status = 'offair'
-    } else {
-        var playlist = this;
-        var next = this.queue[0];
-        this.playing = undefined;
-        if('undefined' !== typeof next){
-            if(next.like >= next.dislike){
-                this.playing = next;
-                this.player.playSound(next.sound, function(){
-                    playlist.queue.shift();
-                    next.sound.deleteFile();
-                    if('undefined' !== next.endPlaying){
-                        next.endPlaying()
-                    }
-                    playlist.playNext();
-                });
-            } else {
-                this.queue.shift();
+    } else{
+    var playlist = this;
+    var next = this.queue[0];
+    if('undefined' !== typeof next){
+        if(next.like >= next.dislike){
+            this.playing = next;
+            this.player.playSound(next.sound, function(){
+                playlist.queue.shift();
                 next.sound.deleteFile();
-                this.playNext();
-            }
+                if('undefined' !== next.endPlaying){
+                    next.endPlaying()
+                }
+                this.playing = undefined;
+                playlist.playNext();
+            });
+        } else {
+            this.queue.shift();
+            next.sound.deleteFile();
+            this.playNext();
         }
     }
 }
+}
 
 module.exports = Playlist;