Merge tag 'v0.19.16'

release v0.19.16
This commit is contained in:
Max Kellermann
2016-06-13 19:03:59 +02:00
4 changed files with 17 additions and 4 deletions

View File

@@ -20,6 +20,7 @@
#include "config.h"
#include "FlacIOHandle.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
#include "Compiler.h"
#include <errno.h>
@@ -87,7 +88,13 @@ FlacIOSeek(FLAC__IOHandle handle, FLAC__int64 _offset, int whence)
return -1;
}
return is->LockSeek(offset, IgnoreError()) ? 0 : -1;
Error error;
if (!is->LockSeek(offset, error)) {
LogError(error);
return -1;
}
return 0;
}
static FLAC__int64

View File

@@ -565,6 +565,8 @@ Player::SeekDecoder()
{
assert(pc.next_song != nullptr);
pc.outputs.Cancel();
const SongTime start_time = pc.next_song->GetStartTime();
if (!dc.LockIsCurrentSong(*pc.next_song)) {
@@ -628,8 +630,6 @@ Player::SeekDecoder()
/* re-fill the buffer after seeking */
buffering = true;
pc.outputs.Cancel();
return true;
}