player/Control: move IDLE_PLAYER to Player::SeekDecoder()

This emits the event even if PlayerControl::Play() is used to replay the current song, which emits the missing "player" idle event. Closes #381

player/Control: move IDLE_PLAYER to Player::SeekDecoder()
7aa1dcee · Max Kellermann · a75d2fdd · 7aa1dcee · 7aa1dcee · 7aa1dcee
Commit 7aa1dcee authored Oct 29, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

NEWS NEWS +2 -0

Control.cxx src/player/Control.cxx +2 -6

Thread.cxx src/player/Thread.cxx +2 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.23 (not yet released)
+* protocol
+  - emit "player" idle event when restarting the current song
 * new clang crash bug workaround

 ver 0.20.22 (2018/10/23)

--- a/src/player/Control.cxx
+++ b/src/player/Control.cxx
@@ -246,12 +246,8 @@ PlayerControl::LockSeek(DetachedSong *song, SongTime t)
 {
 	assert(song != nullptr);

-	{
-		const std::lock_guard<Mutex> protect(mutex);
-		SeekLocked(song, t);
-	}
-
-	idle_add(IDLE_PLAYER);
+	const std::lock_guard<Mutex> protect(mutex);
+	SeekLocked(song, t);
 }

 void

--- a/src/player/Thread.cxx
+++ b/src/player/Thread.cxx
@@ -580,6 +580,8 @@ Player::SeekDecoder()
 {
 	assert(pc.next_song != nullptr);

+	idle_add(IDLE_PLAYER);
+
 	pc.outputs.Cancel();

 	const SongTime start_time = pc.next_song->GetStartTime();