From 2a83ccdb8f71d224341ea5a6ddbc002693d887fb Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 26 Aug 2008 08:27:05 +0200
Subject: added decoder_data()

Moved all of the player-waiting code to decoder_data(), to make
OutputBuffer more generic.
---
 src/inputPlugins/oggvorbis_plugin.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/inputPlugins/oggvorbis_plugin.c')

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)
-- 
cgit v1.2.3