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/wavpack_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/wavpack_plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c index 13f10a1e9..6ab3d4d7a 100644 --- a/src/inputPlugins/wavpack_plugin.c +++ b/src/inputPlugins/wavpack_plugin.c @@ -166,7 +166,7 @@ static void wavpack_decode(WavpackContext *wpc, int canseek, samplesreq = sizeof(chunk) / (4 * dc.audioFormat.channels); - getOutputAudioFormat(&(dc.audioFormat), &(cb.audioFormat)); + getOutputAudioFormat(&(dc.audioFormat), &(ob.audioFormat)); dc.totalTime = (float)allsamples / dc.audioFormat.sampleRate; dc.state = DECODE_STATE_DECODE; @@ -179,7 +179,7 @@ static void wavpack_decode(WavpackContext *wpc, int canseek, if (canseek) { int where; - clearOutputBuffer(); + ob_clear(); where = dc.seekWhere * dc.audioFormat.sampleRate; @@ -210,14 +210,14 @@ static void wavpack_decode(WavpackContext *wpc, int canseek, format_samples(Bps, chunk, samplesgot * dc.audioFormat.channels); - sendDataToOutputBuffer(NULL, 0, chunk, + ob_send(NULL, 0, chunk, samplesgot * outsamplesize, file_time, bitrate, replayGainInfo); } } while (samplesgot == samplesreq); - flushOutputBuffer(); + ob_flush(); } static char *wavpack_tag(WavpackContext *wpc, char *key) |