aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-02 17:02:00 +0100
committerMax Kellermann <max@duempel.org>2008-11-02 17:02:00 +0100
commit3f6fcfd38ebe115d1ba77a7e5b3c1c757b806814 (patch)
treeaeb1590a45dc000b7c6a283c46b11072c6fe77e3
parentc9e15bc418d4a27305b39ccc63e631ac5e329c8b (diff)
downloadmpd-3f6fcfd38ebe115d1ba77a7e5b3c1c757b806814.tar.gz
mpd-3f6fcfd38ebe115d1ba77a7e5b3c1c757b806814.tar.xz
mpd-3f6fcfd38ebe115d1ba77a7e5b3c1c757b806814.zip
aac, mod: don't check for SEEK command
Since the aac and mod plugins have told MPD that they cannot seek, MPD will never send a SEEK command to them. Removed the SEEK comand checks from both plugins.
Diffstat (limited to '')
-rw-r--r--src/decoder/aac_plugin.c16
-rw-r--r--src/decoder/mod_plugin.c4
2 files changed, 2 insertions, 18 deletions
diff --git a/src/decoder/aac_plugin.c b/src/decoder/aac_plugin.c
index 66c2d11be..e7054b879 100644
--- a/src/decoder/aac_plugin.c
+++ b/src/decoder/aac_plugin.c
@@ -414,9 +414,7 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
decoder_data(mpd_decoder, NULL, sampleBuffer,
sampleBufferLen, file_time,
bitRate, NULL);
- if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) {
- decoder_seek_error(mpd_decoder);
- } else if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
+ if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
break;
}
@@ -427,10 +425,6 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
if (!initialized)
return false;
- if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) {
- decoder_seek_error(mpd_decoder);
- }
-
return true;
}
@@ -550,9 +544,7 @@ aac_decode(struct decoder *mpd_decoder, const char *path)
decoder_data(mpd_decoder, NULL, sampleBuffer,
sampleBufferLen, file_time,
bitRate, NULL);
- if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) {
- decoder_seek_error(mpd_decoder);
- } else if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
+ if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
break;
}
@@ -563,10 +555,6 @@ aac_decode(struct decoder *mpd_decoder, const char *path)
if (!initialized)
return false;
- if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) {
- decoder_seek_error(mpd_decoder);
- }
-
return true;
}
diff --git a/src/decoder/mod_plugin.c b/src/decoder/mod_plugin.c
index 3d1c8ccaa..11a59f94c 100644
--- a/src/decoder/mod_plugin.c
+++ b/src/decoder/mod_plugin.c
@@ -200,10 +200,6 @@ mod_decode(struct decoder *decoder, const char *path)
decoder_initialized(decoder, &audio_format, false, 0);
while (true) {
- if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) {
- decoder_seek_error(decoder);
- }
-
if (decoder_get_command(decoder) == DECODE_COMMAND_STOP)
break;