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/aac_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 'src/inputPlugins/aac_plugin.c')
| -rw-r--r-- | src/inputPlugins/aac_plugin.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c index ebf402be1..6e53c6420 100644 --- a/src/inputPlugins/aac_plugin.c +++ b/src/inputPlugins/aac_plugin.c @@ -376,7 +376,7 @@ static int aac_decode(char *path) dc.audioFormat.channels = frameInfo.channels; dc.audioFormat.sampleRate = sampleRate; getOutputAudioFormat(&(dc.audioFormat), - &(cb.audioFormat)); + &(ob.audioFormat)); dc.state = DECODE_STATE_DECODE; } @@ -395,7 +395,7 @@ static int aac_decode(char *path) sampleBufferLen = sampleCount * 2; - sendDataToOutputBuffer(NULL, 0, sampleBuffer, + ob_send(NULL, 0, sampleBuffer, sampleBufferLen, file_time, bitRate, NULL); if (dc.seek) { @@ -408,7 +408,7 @@ static int aac_decode(char *path) } } - flushOutputBuffer(); + ob_flush(); faacDecClose(decoder); if (b.buffer) |