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/audiofile_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/audiofile_plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c index d661278b1..558731dd3 100644 --- a/src/inputPlugins/audiofile_plugin.c +++ b/src/inputPlugins/audiofile_plugin.c @@ -72,7 +72,7 @@ static int audiofile_decode(char *path) (unsigned int)afGetRate(af_fp, AF_DEFAULT_TRACK); dc.audioFormat.channels = (mpd_uint8)afGetVirtualChannels(af_fp, AF_DEFAULT_TRACK); - getOutputAudioFormat(&(dc.audioFormat), &(cb.audioFormat)); + getOutputAudioFormat(&(dc.audioFormat), &(ob.audioFormat)); frame_count = afGetFrameCount(af_fp, AF_DEFAULT_TRACK); @@ -97,7 +97,7 @@ static int audiofile_decode(char *path) while (!eof) { if (dc.seek) { - clearOutputBuffer(); + ob_clear(); current = dc.seekWhere * dc.audioFormat.sampleRate; afSeekFrame(af_fp, AF_DEFAULT_TRACK, current); @@ -112,7 +112,7 @@ static int audiofile_decode(char *path) eof = 1; else { current += ret; - sendDataToOutputBuffer(NULL, + ob_send(NULL, 1, chunk, ret * fs, @@ -125,7 +125,7 @@ static int audiofile_decode(char *path) } } - flushOutputBuffer(); + ob_flush(); } afCloseFile(af_fp); |