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

22
src/decoder_api.c
View File

@@ -82,15 +82,15 @@ void decoder_seek_error(struct decoder * decoder)
* All chunks are full of decoded data; wait for the player to free
* one.
*/
static int need_chunks(struct decoder *decoder, InputStream * inStream,
int seekable)
static enum decoder_command
need_chunks(struct decoder *decoder, InputStream * inStream, int seekable)
{
if (dc.command == DECODE_COMMAND_STOP)
return OUTPUT_BUFFER_DC_STOP;
return DECODE_COMMAND_STOP;
if (dc.command == DECODE_COMMAND_SEEK) {
if (seekable) {
return OUTPUT_BUFFER_DC_SEEK;
return DECODE_COMMAND_SEEK;
} else {
decoder_seek_error(decoder);
}
@@ -102,14 +102,14 @@ static int need_chunks(struct decoder *decoder, InputStream * inStream,
notify_signal(&pc.notify);
}
return 0;
return DECODE_COMMAND_NONE;
}
int decoder_data(struct decoder *decoder, InputStream * inStream,
int seekable,
void *dataIn, size_t dataInLen,
float data_time, mpd_uint16 bitRate,
ReplayGainInfo * replayGainInfo)
enum decoder_command
decoder_data(struct decoder *decoder, InputStream * inStream, int seekable,
void *dataIn, size_t dataInLen,
float data_time, mpd_uint16 bitRate,
ReplayGainInfo * replayGainInfo)
{
size_t nbytes;
char *data;
@@ -153,7 +153,7 @@ int decoder_data(struct decoder *decoder, InputStream * inStream,
}
}
return 0;
return DECODE_COMMAND_NONE;
}
void decoder_flush(mpd_unused struct decoder *decoder)