Merge tag 'v0.21.24'

release v0.21.24
This commit is contained in:
Max Kellermann
2020-06-10 22:58:14 +02:00
16 changed files with 88 additions and 36 deletions

@@ -38,15 +38,19 @@
#include <cassert>
#include <cmath>
#include <stdexcept>
#include <string.h>
DecoderBridge::DecoderBridge(DecoderControl &_dc, bool _initial_seek_pending,
bool _initial_seek_essential,
std::unique_ptr<Tag> _tag) noexcept
:dc(_dc),
initial_seek_pending(_initial_seek_pending),
initial_seek_essential(_initial_seek_essential),
song_tag(std::move(_tag)) {}
DecoderBridge::~DecoderBridge() noexcept
{
/* caller must flush the chunk */
@@ -364,6 +368,10 @@ DecoderBridge::SeekError() noexcept
/* d'oh, we can't seek to the sub-song start position,
what now? - no idea, ignoring the problem for now. */
initial_seek_running = false;
if (initial_seek_essential)
error = std::make_exception_ptr(std::runtime_error("Decoder failed to seek"));
return;
}