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

decoder/flac: move code to FlacSubmitToClient()

Browse Source
This commit is contained in:
Max Kellermann 2018-02-17 13:10:02 +01:00
parent 986ec877b0
commit 2aad015392
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/decoder/plugins/FlacDecoderPlugin.cxx
View File

@ -139,19 +139,25 @@ flac_decoder_initialize(FlacDecoder *data, FLAC__StreamDecoder *sd)
return data->initialized; return data->initialized;
} }
static DecoderCommand
FlacSubmitToClient(DecoderClient &client, FlacDecoder &d) noexcept
{
if (!d.tag.IsEmpty()) {
auto cmd = client.SubmitTag(d.GetInputStream(),
std::move(d.tag));
d.tag.Clear();
return cmd;
} else
return client.GetCommand();
}
static void static void
flac_decoder_loop(FlacDecoder *data, FLAC__StreamDecoder *flac_dec) flac_decoder_loop(FlacDecoder *data, FLAC__StreamDecoder *flac_dec)
{ {
DecoderClient &client = *data->GetClient(); DecoderClient &client = *data->GetClient();
while (true) { while (true) {
DecoderCommand cmd; DecoderCommand cmd = FlacSubmitToClient(client, *data);
if (!data->tag.IsEmpty()) {
cmd = client.SubmitTag(data->GetInputStream(),
std::move(data->tag));
data->tag.Clear();
} else
cmd = client.GetCommand();
if (cmd == DecoderCommand::SEEK) { if (cmd == DecoderCommand::SEEK) {
FLAC__uint64 seek_sample = client.GetSeekFrame(); FLAC__uint64 seek_sample = client.GetSeekFrame();