Skip to content

M
mpd
Commit 03151310 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

player/Control: add method LockApplyBorderPause()

parent baa2bc0c
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 9 deletions
src/player/Control.hxx
View file @ 03151310
...@@ -351,6 +351,17 @@ public: ...@@ -351,6 +351,17 @@ public:
*/ */
void LockSetBorderPause(bool border_pause); void LockSetBorderPause(bool border_pause);
bool ApplyBorderPause() {
if (border_pause)
state = PlayerState::PAUSE;
return border_pause;
}
bool LockApplyBorderPause() {
const ScopeLock lock(mutex);
return ApplyBorderPause();
}
void Kill(); void Kill();
gcc_pure gcc_pure
......
src/player/Thread.cxx
View file @ 03151310
...@@ -948,18 +948,11 @@ Player::SongBorder() ...@@ -948,18 +948,11 @@ Player::SongBorder()
ActivateDecoder(); ActivateDecoder();
pc.Lock(); const bool border_pause = pc.LockApplyBorderPause();
const bool border_pause = pc.border_pause;
if (border_pause) { if (border_pause) {
paused = true; paused = true;
pc.state = PlayerState::PAUSE;
}
pc.Unlock();
if (border_pause)
idle_add(IDLE_PLAYER); idle_add(IDLE_PLAYER);
}
} }
inline void inline void
......
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