buffer input while waiting for outputBuffer space in mp4 and (ogg)flac

Both mp4 and (ogg)flac inputPlugins got HTTP inputStream support later in the game, so their calls to sendDataToOutputBuffer() didn't get updated to support buffering while the outputBuffer was full. This fixes it. git-svn-id: https://svn.musicpd.org/mpd/trunk@6873 09075e82-0dd4-0310-85a5-a0d7c8717e4f

buffer input while waiting for outputBuffer space in mp4 and (ogg)flac
8b141ae5 · Eric Wong · 54339dfb · 8b141ae5 · 8b141ae5
Commit 8b141ae5 authored Sep 10, 2007 by Eric Wong
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

_flac_common.h src/inputPlugins/_flac_common.h +2 -1

mp4_plugin.c src/inputPlugins/mp4_plugin.c +1 -1

No files found.
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -172,7 +172,8 @@ MpdTag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block,
 /* keep this inlined, this is just macro but prettier :) */
 static inline int flacSendChunk(FlacData * data)
 {
-	if (sendDataToOutputBuffer(data->cb, NULL, data->dc, 1, data->chunk,
+	if (sendDataToOutputBuffer(data->cb, data->inStream,
+	                           data->dc, 1, data->chunk,
 				   data->chunk_length, data->time,
 				   data->bitRate,
 				   data->replayGainInfo) ==

--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -285,7 +285,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc,

 		sampleBuffer += offset * channels * 2;

-		sendDataToOutputBuffer(cb, NULL, dc, 1, sampleBuffer,
+		sendDataToOutputBuffer(cb, inStream, dc, 1, sampleBuffer,
 				       sampleBufferLen, time, bitRate, NULL);
 		if (dc->stop) {
 			eof = 1;