aboutsummaryrefslogtreecommitdiffstats
path: root/src/OutputThread.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-09-26 21:51:45 +0200
committerMax Kellermann <max@duempel.org>2013-09-26 21:51:45 +0200
commitce1d8975751251d49581129193e09490ca650a8b (patch)
tree27eda9989e35a74ccdade4924c47391ce2ee56b6 /src/OutputThread.cxx
parent17e108a10a79a5cfb44981323442c92e35813e98 (diff)
downloadmpd-ce1d8975751251d49581129193e09490ca650a8b.tar.gz
mpd-ce1d8975751251d49581129193e09490ca650a8b.tar.xz
mpd-ce1d8975751251d49581129193e09490ca650a8b.zip
MusicPipe: expose the C++ API
Diffstat (limited to 'src/OutputThread.cxx')
-rw-r--r--src/OutputThread.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx
index fb73e158d..5f94e76d8 100644
--- a/src/OutputThread.cxx
+++ b/src/OutputThread.cxx
@@ -263,7 +263,7 @@ ao_reopen(struct audio_output *ao)
{
if (!ao->config_audio_format.IsFullyDefined()) {
if (ao->open) {
- const struct music_pipe *mp = ao->pipe;
+ const MusicPipe *mp = ao->pipe;
ao_close(ao, true);
ao->pipe = mp;
}
@@ -484,7 +484,7 @@ ao_next_chunk(struct audio_output *ao)
/* continue the previous play() call */
? ao->chunk->next
/* get the first chunk from the pipe */
- : music_pipe_peek(ao->pipe);
+ : ao->pipe->Peek();
}
/**
@@ -621,7 +621,7 @@ static gpointer audio_output_task(gpointer arg)
case AO_COMMAND_DRAIN:
if (ao->open) {
assert(ao->chunk == NULL);
- assert(music_pipe_peek(ao->pipe) == NULL);
+ assert(ao->pipe->Peek() == nullptr);
ao->mutex.unlock();
ao_plugin_drain(ao);