From 981b76bace9f2df6db391c677bce34cadad70653 Mon Sep 17 00:00:00 2001
From: Konstantin Seiler <list@kseiler.de>
Date: Mon, 3 Feb 2020 10:11:27 +1100
Subject: [PATCH] Keep the sink open Fix typo

---
 connect/src/spirc.rs   |  2 +-
 playback/src/player.rs | 43 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs
index 71a4454..b39ec3a 100644
--- a/connect/src/spirc.rs
+++ b/connect/src/spirc.rs
@@ -1142,7 +1142,7 @@ impl SpircTask {
         // tracks in each frame either have a gid or uri (that may or may not be a valid track)
         // E.g - context based frames sometimes contain tracks with <spotify:meta:page:>
 
-        let mut track_ref = self.state.get_track()[index as usize].clone();
+        let mut track_ref = self.state.get_track()[new_playlist_index as usize].clone();
         let mut track_id = self.get_spotify_id_for_track(&track_ref);
         while track_id.is_err() || track_id.unwrap().audio_type == SpotifyAudioType::NonPlayable {
             warn!(
diff --git a/playback/src/player.rs b/playback/src/player.rs
index c1faa7c..a00b896 100644
--- a/playback/src/player.rs
+++ b/playback/src/player.rs
@@ -749,8 +749,8 @@ impl Future for PlayerInternal {
                 }
             }
 
-            if self.state.is_playing() && !self.sink_running {
-                self.start_sink();
+            if self.state.is_playing() {
+                self.ensure_sink_running();
             }
 
             if self.sink_running {
@@ -866,23 +866,24 @@ impl PlayerInternal {
         position_ms as u64 * 441 / 10
     }
 
-    fn start_sink(&mut self) {
-        match self.sink.start() {
-            Ok(()) => self.sink_running = true,
-            Err(err) => error!("Could not start audio: {}", err),
+    fn ensure_sink_running(&mut self) {
+        if !self.sink_running {
+            trace!("== Starting sink ==");
+            match self.sink.start() {
+                Ok(()) => self.sink_running = true,
+                Err(err) => error!("Could not start audio: {}", err),
+            }
         }
     }
 
-    fn stop_sink_if_running(&mut self) {
+    fn ensure_sink_stopped(&mut self) {
         if self.sink_running {
-            self.stop_sink();
+            trace!("== Stopping sink ==");
+            self.sink.stop().unwrap();
+            self.sink_running = false;
         }
     }
 
-    fn stop_sink(&mut self) {
-        self.sink.stop().unwrap();
-        self.sink_running = false;
-    }
 
     fn handle_player_stop(&mut self) {
         match self.state {
@@ -906,7 +907,7 @@ impl PlayerInternal {
                 play_request_id,
                 ..
             } => {
-                self.stop_sink_if_running();
+                self.ensure_sink_stopped();
                 self.send_event(PlayerEvent::Stopped {
                     track_id,
                     play_request_id,
@@ -934,7 +935,7 @@ impl PlayerInternal {
                 play_request_id,
                 position_ms,
             });
-            self.start_sink();
+            self.ensure_sink_running();
         } else {
             warn!("Player::play called from invalid state");
         }
@@ -951,7 +952,7 @@ impl PlayerInternal {
         {
             self.state.playing_to_paused();
 
-            self.stop_sink_if_running();
+            self.ensure_sink_stopped();
             let position_ms = Self::position_pcm_to_ms(stream_position_pcm);
             self.send_event(PlayerEvent::Paused {
                 track_id,
@@ -980,13 +981,12 @@ impl PlayerInternal {
 
                     if let Err(err) = self.sink.write(&packet.data()) {
                         error!("Could not write audio: {}", err);
-                        self.stop_sink();
+                        self.ensure_sink_stopped();
                     }
                 }
             }
 
             None => {
-                self.stop_sink();
                 self.state.playing_to_end_of_track();
                 if let PlayerState::EndOfTrack {
                     track_id,
@@ -1040,7 +1040,7 @@ impl PlayerInternal {
         }
 
         if start_playback {
-            self.start_sink();
+            self.ensure_sink_running();
 
             self.send_event(PlayerEvent::Playing {
                 track_id,
@@ -1094,10 +1094,6 @@ impl PlayerInternal {
                 play,
                 position_ms,
             } => {
-                if self.state.is_playing() {
-                    self.stop_sink_if_running();
-                }
-
                 // emit the correct player event
                 match self.state {
                     PlayerState::Playing {
@@ -1228,6 +1224,9 @@ impl PlayerInternal {
                 // We need to load the track - either from scratch or by completing a preload.
                 // In any case we go into a Loading state to load the track.
                 if !load_command_processed {
+
+                    self.ensure_sink_stopped();
+
                     self.send_event(PlayerEvent::Loading {
                         track_id,
                         play_request_id,