oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

eliminate OUTPUT_BUFFER_DC_STOP, OUTPUT_BUFFER_DC_SEEK

Browse Source 
(Ab)use the decoder_command enumeration, which has nearly the same
values and the same meaning.
This commit is contained in:
Max Kellermann
2008-08-26 08:27:07 +02:00
parent 67bf4b448d
commit c7384b65ac
5 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/inputPlugins/_flac_common.h
View File

@@ -171,7 +171,7 @@ static inline int flacSendChunk(FlacData * data)
1, data->chunk,
data->chunk_length, data->time,
data->bitRate,
data->replayGainInfo) == OUTPUT_BUFFER_DC_STOP)
data->replayGainInfo) == DECODE_COMMAND_STOP)
return -1;
return 0;

7
src/inputPlugins/mp3_plugin.c
View File

@@ -927,21 +927,22 @@ static int mp3Read(mp3DecodeData * data, struct decoder *decoder,
}
if (data->outputPtr >= data->outputBufferEnd) {
ret = decoder_data(decoder, data->inStream,
enum decoder_command cmd;
cmd = decoder_data(decoder, data->inStream,
data->inStream->seekable,
data->outputBuffer,
data->outputPtr - data->outputBuffer,
data->elapsedTime,
data->bitRate / 1000,
(replayGainInfo != NULL) ? *replayGainInfo : NULL);
if (ret == OUTPUT_BUFFER_DC_STOP) {
if (cmd == DECODE_COMMAND_STOP) {
data->flush = 0;
return DECODE_BREAK;
}
data->outputPtr = data->outputBuffer;
if (ret == OUTPUT_BUFFER_DC_SEEK)
if (cmd == DECODE_COMMAND_STOP)
break;
}
}