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

decoder/Client: new interface which wraps struct Decoder

Browse Source 
Prepare for a Decoder API redesign based on an abstract class with
virtual methods.
This commit is contained in:
Max Kellermann
2016-11-18 07:13:35 +01:00
parent 595d1942cb
commit fd77acc217
46 changed files with 460 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder/plugins/GmeDecoderPlugin.cxx
View File

@@ -129,7 +129,7 @@ gme_container_scan(Path path_fs, const unsigned int tnum)
}
static void
gme_file_decode(Decoder &decoder, Path path_fs)
gme_file_decode(DecoderClient &client, Path path_fs)
{
const auto container = ParseContainerPath(path_fs);
@@ -171,7 +171,7 @@ gme_file_decode(Decoder &decoder, Path path_fs)
SampleFormat::S16,
GME_CHANNELS);
decoder_initialized(decoder, audio_format, true, song_len);
decoder_initialized(client, audio_format, true, song_len);
gme_err = gme_start_track(emu, container.track);
if (gme_err != nullptr)
@@ -190,15 +190,15 @@ gme_file_decode(Decoder &decoder, Path path_fs)
return;
}
cmd = decoder_data(decoder, nullptr, buf, sizeof(buf), 0);
cmd = decoder_data(client, nullptr, buf, sizeof(buf), 0);
if (cmd == DecoderCommand::SEEK) {
unsigned where = decoder_seek_time(decoder).ToMS();
unsigned where = decoder_seek_time(client).ToMS();
gme_err = gme_seek(emu, where);
if (gme_err != nullptr) {
LogWarning(gme_domain, gme_err);
decoder_seek_error(decoder);
decoder_seek_error(client);
} else
decoder_command_finished(decoder);
decoder_command_finished(client);
}
if (gme_track_ended(emu))