From 412ce8bdc48f05963b7ef7eca27d760aff3a8500 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 13 Apr 2008 01:16:27 +0000 Subject: Make the OutputBuffer API more consistent We had functions names varied between outputBufferFoo, fooOutputBuffer, and output_buffer_foo That was too confusing for my little brain to handle. And the global variable was somehow named 'cb' instead of the more obvious 'ob'... git-svn-id: https://svn.musicpd.org/mpd/trunk@7355 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/inputPlugins/mp4_plugin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/inputPlugins/mp4_plugin.c') diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c index 1dd418b2d..7f13ca344 100644 --- a/src/inputPlugins/mp4_plugin.c +++ b/src/inputPlugins/mp4_plugin.c @@ -217,7 +217,7 @@ static int mp4_decode(InputStream * inStream) if (seeking && seekPositionFound) { seekPositionFound = 0; - clearOutputBuffer(); + ob_clear(); seeking = 0; dc.seek = 0; decoder_wakeup_player(); @@ -255,7 +255,7 @@ static int mp4_decode(InputStream * inStream) dc.audioFormat.sampleRate = scale; dc.audioFormat.channels = frameInfo.channels; getOutputAudioFormat(&(dc.audioFormat), - &(cb.audioFormat)); + &(ob.audioFormat)); dc.state = DECODE_STATE_DECODE; } @@ -277,7 +277,7 @@ static int mp4_decode(InputStream * inStream) sampleBuffer += offset * channels * 2; - sendDataToOutputBuffer(inStream, 1, sampleBuffer, + ob_send(inStream, 1, sampleBuffer, sampleBufferLen, file_time, bitRate, NULL); if (dc.stop) { @@ -295,11 +295,11 @@ static int mp4_decode(InputStream * inStream) return -1; if (dc.seek && seeking) { - clearOutputBuffer(); + ob_clear(); dc.seek = 0; decoder_wakeup_player(); } - flushOutputBuffer(); + ob_flush(); return 0; } -- cgit v1.2.3