diff options
| author | Max Kellermann <max@duempel.org> | 2008-08-26 08:27:05 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-08-26 08:27:05 +0200 |
| commit | 2a83ccdb8f71d224341ea5a6ddbc002693d887fb (patch) | |
| tree | 7a6c3f2a480739e2951fe3141c8ca8a1aacc0db7 /src/inputPlugins/oggvorbis_plugin.c | |
| parent | 8814c0c898162f25ef4851df5cf8c9e68ff83942 (diff) | |
| download | mpd-2a83ccdb8f71d224341ea5a6ddbc002693d887fb.tar.gz mpd-2a83ccdb8f71d224341ea5a6ddbc002693d887fb.tar.xz mpd-2a83ccdb8f71d224341ea5a6ddbc002693d887fb.zip | |
added decoder_data()
Moved all of the player-waiting code to decoder_data(), to make
OutputBuffer more generic.
Diffstat (limited to 'src/inputPlugins/oggvorbis_plugin.c')
| -rw-r--r-- | src/inputPlugins/oggvorbis_plugin.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c index 0867de69d..1333bc15c 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -309,12 +309,11 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) if ((test = ov_bitrate_instant(&vf)) > 0) { bitRate = test / 1000; } - ob_send(inStream, - inStream->seekable, - chunk, chunkpos, - ov_pcm_tell(&vf) / - dc.audioFormat.sampleRate, - bitRate, replayGainInfo); + decoder_data(decoder, inStream, + inStream->seekable, + chunk, chunkpos, + ov_pcm_tell(&vf) / dc.audioFormat.sampleRate, + bitRate, replayGainInfo); chunkpos = 0; if (dc.command == DECODE_COMMAND_STOP) break; @@ -322,10 +321,10 @@ static int oggvorbis_decode(struct decoder * decoder, InputStream * inStream) } if (dc.command != DECODE_COMMAND_STOP && chunkpos > 0) { - ob_send(NULL, inStream->seekable, - chunk, chunkpos, - ov_time_tell(&vf), bitRate, - replayGainInfo); + decoder_data(decoder, NULL, inStream->seekable, + chunk, chunkpos, + ov_time_tell(&vf), bitRate, + replayGainInfo); } if (replayGainInfo) |