decoder/API: check initial_seek_running in _check_cancel_read()

The "seeking" flag is not set for the initial seek, and so decoder_read() could be canceled when another SEEK was emitted during initial seek. This fixes several seek problems, for example the one reported for the FLAC decoder plugin: https://bugs.musicpd.org/view.php?id=4552

decoder/API: check initial_seek_running in _check_cancel_read()
6f59d71e · Max Kellermann · f9130f42 · 6f59d71e · 6f59d71e
Commit 6f59d71e authored Jul 06, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

NEWS NEWS +1 -0

DecoderAPI.cxx src/decoder/DecoderAPI.cxx +2 -1

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.19.17 (not yet released)
 * decoder
  - flac: fix assertion failure while seeking
+  - fix seek problems in several plugins
 * fix spurious seek error "Failed to allocate silence buffer"
 * replay gain: fix "replay_gain_handler mixer" setting
 * DSD: use 0x69 as silence pattern

--- a/src/decoder/DecoderAPI.cxx
+++ b/src/decoder/DecoderAPI.cxx
@@ -301,7 +301,8 @@ decoder_check_cancel_read(const Decoder *decoder)
 	/* ignore the SEEK command during initialization, the plugin
 	   should handle that after it has initialized successfully */
 	if (dc.command == DecoderCommand::SEEK &&
-	    (dc.state == DecoderState::START || decoder->seeking))
+	    (dc.state == DecoderState::START || decoder->seeking ||
+	     decoder->initial_seek_running))
 		return false;

 	return true;