refactor(player): extract nextFromPlaylist function #23

rudywaltz · Sep 25, 2019 · b5a2f9b · b5a2f9b
1 parent 678f1c4
commit b5a2f9b
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/components/Player.svelte b/src/components/Player.svelte
@@ -77,23 +77,27 @@
       return;
     }
 
-    $song = $playlist.shift();
-    $playlist = $playlist; //TODO: nicer solution
-    currentSound = createCurrentSong();
+    nextFromPlaylist();
   }
 
   const nextSong = () => {
+    currentSound.unload();
+
     if (!$playlist.length) {
       clearPollingSong = true;
       resetSongStatus();
       return;
     }
 
-    $song = $playlist.shift();
-    $playlist = $playlist; //TODO: nicer solution
-    currentSound = createCurrentSong();
+    nextFromPlaylist();
+
   }
 
+  const nextFromPlaylist = () => {
+      $song = $playlist.shift();
+      $playlist = $playlist; //TODO: nicer solution
+      currentSound = createCurrentSong();
+  }
   const toggleSound = () => playing ? pauseSound() : playSound();
 
   const playSound = () => {
@@ -102,7 +106,6 @@
     clearPollingSong = false;
 
     const pollingSongData = setInterval(() => {
-      console.log('pollypirot');
       if (!playing) {
         time = 0;
         clearInterval(pollingSongData);