From ce1d8975751251d49581129193e09490ca650a8b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 26 Sep 2013 21:51:45 +0200 Subject: MusicPipe: expose the C++ API --- src/OutputThread.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/OutputThread.cxx') 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); -- cgit v1.2.3