aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder_api.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-26 08:27:07 +0200
committerMax Kellermann <max@duempel.org>2008-08-26 08:27:07 +0200
commitc7384b65ac422e1dd5eadcb06b74931de37a6f58 (patch)
treebec4ca1f705b4920ff983f21c5a73fd71911c24e /src/decoder_api.c
parent67bf4b448dad25f2f0c60451f53fcacb0a0bde15 (diff)
downloadmpd-c7384b65ac422e1dd5eadcb06b74931de37a6f58.tar.gz
mpd-c7384b65ac422e1dd5eadcb06b74931de37a6f58.tar.xz
mpd-c7384b65ac422e1dd5eadcb06b74931de37a6f58.zip
eliminate OUTPUT_BUFFER_DC_STOP, OUTPUT_BUFFER_DC_SEEK
(Ab)use the decoder_command enumeration, which has nearly the same values and the same meaning.
Diffstat (limited to '')
-rw-r--r--src/decoder_api.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 2009733ad..d933f6c7e 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -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)