player/Control: don't stop playback in Play()

Instead of stopping playback completely, only CANCEL the queued song if necessary, and use the SEEK command to play the selected song. SEEK will take care for current playback state.

player/Control: don't stop playback in Play()
45f6129a · Max Kellermann · f3503e00 · 45f6129a
Commit 45f6129a authored Nov 11, 2015 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

Control.cxx src/player/Control.cxx +1 -9

No files found.
--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
@@ -55,15 +55,7 @@ PlayerControl::Play(DetachedSong *song)
 	assert(song != nullptr);

 	const ScopeLock protect(mutex);
-
-	if (state != PlayerState::STOP)
-		SynchronousCommand(PlayerCommand::STOP);
-
-	assert(next_song == nullptr);
-
-	EnqueueSongLocked(song);
-
-	assert(next_song == nullptr);
+	SeekLocked(song, SongTime::zero(), IgnoreError());
 }

 void