aboutsummaryrefslogtreecommitdiffstats
path: root/src/DecoderAPI.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-27 17:20:50 +0100
committerMax Kellermann <max@duempel.org>2013-01-27 18:39:32 +0100
commit6f3d70b5e24cebbd6fd8c3a665a801628ef912ff (patch)
tree88ab67b76bac4b88422c3debe7c46d6168a71934 /src/DecoderAPI.cxx
parent257a0dee758049586efbf0dc3f0339b0cef03456 (diff)
downloadmpd-6f3d70b5e24cebbd6fd8c3a665a801628ef912ff.tar.gz
mpd-6f3d70b5e24cebbd6fd8c3a665a801628ef912ff.tar.xz
mpd-6f3d70b5e24cebbd6fd8c3a665a801628ef912ff.zip
DecoderControl, InputStream: use Mutex/Cond instead of GMutex/GCond
Diffstat (limited to 'src/DecoderAPI.cxx')
-rw-r--r--src/DecoderAPI.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/DecoderAPI.cxx b/src/DecoderAPI.cxx
index 56c25e489..857ee72d1 100644
--- a/src/DecoderAPI.cxx
+++ b/src/DecoderAPI.cxx
@@ -67,7 +67,7 @@ decoder_initialized(struct decoder *decoder,
dc->Lock();
dc->state = DECODE_STATE_DECODE;
- g_cond_signal(dc->client_cond);
+ dc->client_cond.signal();
dc->Unlock();
g_debug("audio_format=%s, seekable=%s",
@@ -192,7 +192,7 @@ decoder_command_finished(struct decoder *decoder)
}
dc->command = DECODE_COMMAND_NONE;
- g_cond_signal(dc->client_cond);
+ dc->client_cond.signal();
dc->Unlock();
}
@@ -285,7 +285,7 @@ size_t decoder_read(struct decoder *decoder,
if (input_stream_available(is))
break;
- g_cond_wait(is->cond, is->mutex);
+ is->cond->wait(*is->mutex);
}
nbytes = input_stream_read(is, buffer, length, &error);
@@ -324,7 +324,7 @@ do_send_tag(struct decoder *decoder, const struct tag *tag)
/* there is a partial chunk - flush it, we want the
tag in a new chunk */
decoder_flush_chunk(decoder);
- g_cond_signal(decoder->dc->client_cond);
+ decoder->dc->client_cond.signal();
}
assert(decoder->chunk == NULL);
@@ -437,7 +437,7 @@ decoder_data(struct decoder *decoder,
if (dest == NULL) {
/* the chunk is full, flush it */
decoder_flush_chunk(decoder);
- g_cond_signal(dc->client_cond);
+ dc->client_cond.signal();
continue;
}
@@ -456,7 +456,7 @@ decoder_data(struct decoder *decoder,
if (full) {
/* the chunk is full, flush it */
decoder_flush_chunk(decoder);
- g_cond_signal(dc->client_cond);
+ dc->client_cond.signal();
}
data = (const uint8_t *)data + nbytes;
@@ -551,7 +551,7 @@ decoder_replay_gain(struct decoder *decoder,
replay gain values affect the following
samples */
decoder_flush_chunk(decoder);
- g_cond_signal(decoder->dc->client_cond);
+ decoder->dc->client_cond.signal();
}
} else
decoder->replay_gain_serial = 0;