oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/Client: add DecoderCommand/seek virtual methods

Browse Source
This commit is contained in:
Max Kellermann
2016-11-18 08:15:07 +01:00
parent 66fb352cca
commit 47a0f46ce8
24 changed files with 156 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@@ -985,18 +985,18 @@ MadDecoder::Read()
if (cmd == DecoderCommand::SEEK) {
assert(input_stream.IsSeekable());
unsigned long j =
TimeToFrame(decoder_seek_time(*client));
const auto t = client->GetSeekTime();
unsigned long j = TimeToFrame(t);
if (j < highest_frame) {
if (Seek(frame_offsets[j])) {
current_frame = j;
decoder_command_finished(*client);
client->CommandFinished();
} else
decoder_seek_error(*client);
client->SeekError();
} else {
seek_time = decoder_seek_time(*client);
seek_time = t;
mute_frame = MUTEFRAME_SEEK;
decoder_command_finished(*client);
client->CommandFinished();
}
} else if (cmd != DecoderCommand::NONE)
return false;
@@ -1042,7 +1042,7 @@ mp3_decode(DecoderClient &client, InputStream &input_stream)
if (!data.DecodeFirstFrame(&tag)) {
delete tag;
if (decoder_get_command(client) == DecoderCommand::NONE)
if (client.GetCommand() == DecoderCommand::NONE)
LogError(mad_domain,
"input/Input does not appear to be a mp3 bit stream");
return;