diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-04-13 01:16:15 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-13 01:16:15 +0000 |
| commit | c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3 (patch) | |
| tree | b8c2ff14310e1e659f509aeae0cf847608af2d5f /src/inputPlugins/aac_plugin.c | |
| parent | dec6b1612e953c6029d963ff55d2b4a669b60f43 (diff) | |
| download | mpd-c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3.tar.gz mpd-c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3.tar.xz mpd-c1963ed483c66e85ac19ce8c3a6dbc6b19ca30c3.zip | |
Stop passing our single OutputBuffer object everywhere
All of our main singleton data structures are implicitly shared,
so there's no reason to keep passing them around and around in
the stack and making our internal API harder to deal with.
git-svn-id: https://svn.musicpd.org/mpd/trunk@7354 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputPlugins/aac_plugin.c')
| -rw-r--r-- | src/inputPlugins/aac_plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c index aeda10492..ebf402be1 100644 --- a/src/inputPlugins/aac_plugin.c +++ b/src/inputPlugins/aac_plugin.c @@ -282,7 +282,7 @@ static int getAacTotalTime(char *file) return file_time; } -static int aac_decode(OutputBuffer * cb, char *path) +static int aac_decode(char *path) { float file_time; float totalTime; @@ -376,7 +376,7 @@ static int aac_decode(OutputBuffer * cb, char *path) dc.audioFormat.channels = frameInfo.channels; dc.audioFormat.sampleRate = sampleRate; getOutputAudioFormat(&(dc.audioFormat), - &(cb->audioFormat)); + &(cb.audioFormat)); dc.state = DECODE_STATE_DECODE; } @@ -395,7 +395,7 @@ static int aac_decode(OutputBuffer * cb, char *path) sampleBufferLen = sampleCount * 2; - sendDataToOutputBuffer(cb, NULL, 0, sampleBuffer, + sendDataToOutputBuffer(NULL, 0, sampleBuffer, sampleBufferLen, file_time, bitRate, NULL); if (dc.seek) { @@ -408,7 +408,7 @@ static int aac_decode(OutputBuffer * cb, char *path) } } - flushOutputBuffer(cb); + flushOutputBuffer(); faacDecClose(decoder); if (b.buffer) |