diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-04-13 01:16:27 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-13 01:16:27 +0000 |
| commit | 412ce8bdc48f05963b7ef7eca27d760aff3a8500 (patch) | |
| tree | 1d6fffc5adb99c46405fb700650a8d68baa60b6a /src/inputPlugins/mp4_plugin.c | |
| parent | c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3 (diff) | |
| download | mpd-412ce8bdc48f05963b7ef7eca27d760aff3a8500.tar.gz mpd-412ce8bdc48f05963b7ef7eca27d760aff3a8500.tar.xz mpd-412ce8bdc48f05963b7ef7eca27d760aff3a8500.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/inputPlugins/mp4_plugin.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |