Commit 7aa1dcee authored by Max Kellermann's avatar Max Kellermann

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
parent a75d2fdd
ver 0.20.23 (not yet released) ver 0.20.23 (not yet released)
* protocol
- emit "player" idle event when restarting the current song
* new clang crash bug workaround * new clang crash bug workaround
ver 0.20.22 (2018/10/23) ver 0.20.22 (2018/10/23)
......
...@@ -246,12 +246,8 @@ PlayerControl::LockSeek(DetachedSong *song, SongTime t) ...@@ -246,12 +246,8 @@ PlayerControl::LockSeek(DetachedSong *song, SongTime t)
{ {
assert(song != nullptr); assert(song != nullptr);
{ const std::lock_guard<Mutex> protect(mutex);
const std::lock_guard<Mutex> protect(mutex); SeekLocked(song, t);
SeekLocked(song, t);
}
idle_add(IDLE_PLAYER);
} }
void void
......
...@@ -580,6 +580,8 @@ Player::SeekDecoder() ...@@ -580,6 +580,8 @@ Player::SeekDecoder()
{ {
assert(pc.next_song != nullptr); assert(pc.next_song != nullptr);
idle_add(IDLE_PLAYER);
pc.outputs.Cancel(); pc.outputs.Cancel();
const SongTime start_time = pc.next_song->GetStartTime(); const SongTime start_time = pc.next_song->GetStartTime();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment