diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-27 17:20:50 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-27 18:39:32 +0100 |
| commit | 6f3d70b5e24cebbd6fd8c3a665a801628ef912ff (patch) | |
| tree | 88ab67b76bac4b88422c3debe7c46d6168a71934 /src/DecoderControl.cxx | |
| parent | 257a0dee758049586efbf0dc3f0339b0cef03456 (diff) | |
DecoderControl, InputStream: use Mutex/Cond instead of GMutex/GCond
Diffstat (limited to 'src/DecoderControl.cxx')
| -rw-r--r-- | src/DecoderControl.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/DecoderControl.cxx b/src/DecoderControl.cxx index 3661beaf..c2331105 100644 --- a/src/DecoderControl.cxx +++ b/src/DecoderControl.cxx @@ -29,8 +29,6 @@ decoder_control::decoder_control() :thread(nullptr), - mutex(g_mutex_new()), cond(g_cond_new()), - client_cond(g_cond_new()), state(DECODE_STATE_STOP), command(DECODE_COMMAND_NONE), song(nullptr), @@ -45,9 +43,6 @@ decoder_control::~decoder_control() if (song != NULL) song_free(song); - g_cond_free(client_cond); - g_cond_free(cond); - g_mutex_free(mutex); g_free(mixramp_start); g_free(mixramp_end); g_free(mixramp_prev_end); @@ -57,7 +52,7 @@ static void dc_command_wait_locked(struct decoder_control *dc) { while (dc->command != DECODE_COMMAND_NONE) - g_cond_wait(dc->client_cond, dc->mutex); + dc->WaitForDecoder(); } static void |