diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-10 09:30:01 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-10 10:12:54 +0100 |
| commit | 06e0741a5293b1db2ef5f2b5778e3669f2dea70e (patch) | |
| tree | c4087216ef0ff34a0854ff50dc259c0d13c41471 /src/PlayerControl.hxx | |
| parent | 0b93445380ba39c13813e1a236b183883f5a54db (diff) | |
PlayerControl: switch to the Mutex/Cond classes
Diffstat (limited to 'src/PlayerControl.hxx')
| -rw-r--r-- | src/PlayerControl.hxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/PlayerControl.hxx b/src/PlayerControl.hxx index 1a050320..322b95c8 100644 --- a/src/PlayerControl.hxx +++ b/src/PlayerControl.hxx @@ -21,6 +21,8 @@ #define MPD_PLAYER_H #include "audio_format.h" +#include "thread/Mutex.hxx" +#include "thread/Cond.hxx" #include <glib.h> @@ -99,12 +101,12 @@ struct player_control { /** * This lock protects #command, #state, #error. */ - GMutex *mutex; + Mutex mutex; /** * Trigger this object after you have modified #command. */ - GCond *cond; + Cond cond; enum player_command command; enum player_state state; @@ -158,7 +160,7 @@ struct player_control { static inline void player_lock(struct player_control *pc) { - g_mutex_lock(pc->mutex); + pc->mutex.lock(); } /** @@ -167,7 +169,7 @@ player_lock(struct player_control *pc) static inline void player_unlock(struct player_control *pc) { - g_mutex_unlock(pc->mutex); + pc->mutex.unlock(); } /** @@ -178,7 +180,7 @@ player_unlock(struct player_control *pc) static inline void player_wait(struct player_control *pc) { - g_cond_wait(pc->cond, pc->mutex); + pc->cond.wait(pc->mutex); } /** @@ -198,7 +200,7 @@ player_wait_decoder(struct player_control *pc, struct decoder_control *dc); static inline void player_signal(struct player_control *pc) { - g_cond_signal(pc->cond); + pc->cond.signal(); } /** |