Skip to content

M
mpd
Commit 3f6fcfd3 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent c9e15bc4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 18 deletions
src/decoder/aac_plugin.c
View file @ 3f6fcfd3
...@@ -414,9 +414,7 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *inStream) ...@@ -414,9 +414,7 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
decoder_data(mpd_decoder, NULL, sampleBuffer, decoder_data(mpd_decoder, NULL, sampleBuffer,
sampleBufferLen, file_time, sampleBufferLen, file_time,
bitRate, NULL); bitRate, NULL);
if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) { if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
decoder_seek_error(mpd_decoder);
} else if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
break; break;
} }
...@@ -427,10 +425,6 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *inStream) ...@@ -427,10 +425,6 @@ aac_stream_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
if (!initialized) if (!initialized)
return false; return false;
if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) {
decoder_seek_error(mpd_decoder);
}
return true; return true;
} }
...@@ -550,9 +544,7 @@ aac_decode(struct decoder *mpd_decoder, const char *path) ...@@ -550,9 +544,7 @@ aac_decode(struct decoder *mpd_decoder, const char *path)
decoder_data(mpd_decoder, NULL, sampleBuffer, decoder_data(mpd_decoder, NULL, sampleBuffer,
sampleBufferLen, file_time, sampleBufferLen, file_time,
bitRate, NULL); bitRate, NULL);
if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) { if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
decoder_seek_error(mpd_decoder);
} else if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
break; break;
} }
...@@ -563,10 +555,6 @@ aac_decode(struct decoder *mpd_decoder, const char *path) ...@@ -563,10 +555,6 @@ aac_decode(struct decoder *mpd_decoder, const char *path)
if (!initialized) if (!initialized)
return false; return false;
if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) {
decoder_seek_error(mpd_decoder);
}
return true; return true;
} }
......
src/decoder/mod_plugin.c
View file @ 3f6fcfd3
...@@ -200,10 +200,6 @@ mod_decode(struct decoder *decoder, const char *path) ...@@ -200,10 +200,6 @@ mod_decode(struct decoder *decoder, const char *path)
decoder_initialized(decoder, &audio_format, false, 0); decoder_initialized(decoder, &audio_format, false, 0);
while (true) { while (true) {
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK) {
decoder_seek_error(decoder);
}
if (decoder_get_command(decoder) == DECODE_COMMAND_STOP) if (decoder_get_command(decoder) == DECODE_COMMAND_STOP)
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment