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

decoder/mad: rename a few misnamed methods

Browse Source
This commit is contained in:
Max Kellermann 2019-08-03 11:32:42 +02:00
parent 8a432c9b7f
commit 9d0fe725eb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,13 +194,13 @@ private:
* Sends the synthesized current frame via * Sends the synthesized current frame via
* DecoderClient::SubmitData(). * DecoderClient::SubmitData().
*/ */
DecoderCommand SendPCM(unsigned i, unsigned pcm_length) noexcept; DecoderCommand SubmitPCM(unsigned i, unsigned pcm_length) noexcept;
/** /**
* Synthesize the current frame and send it via * Synthesize the current frame and send it via
* DecoderClient::SubmitData(). * DecoderClient::SubmitData().
*/ */
DecoderCommand SyncAndSend() noexcept; DecoderCommand SynthAndSubmit() noexcept;
/** /**
* @return false to stop decoding * @return false to stop decoding
@ -845,7 +845,7 @@ MadDecoder::UpdateTimerNextFrame() noexcept
} }
DecoderCommand DecoderCommand
MadDecoder::SendPCM(unsigned i, unsigned pcm_length) noexcept MadDecoder::SubmitPCM(unsigned i, unsigned pcm_length) noexcept
{ {
unsigned max_samples = sizeof(output_buffer) / unsigned max_samples = sizeof(output_buffer) /
sizeof(output_buffer[0]) / sizeof(output_buffer[0]) /
@ -874,7 +874,7 @@ MadDecoder::SendPCM(unsigned i, unsigned pcm_length) noexcept
} }
inline DecoderCommand inline DecoderCommand
MadDecoder::SyncAndSend() noexcept MadDecoder::SynthAndSubmit() noexcept
{ {
mad_synth_frame(&synth, &frame); mad_synth_frame(&synth, &frame);
@ -912,7 +912,7 @@ MadDecoder::SyncAndSend() noexcept
pcm_length -= drop_end_samples; pcm_length -= drop_end_samples;
} }
auto cmd = SendPCM(i, pcm_length); auto cmd = SubmitPCM(i, pcm_length);
if (cmd != DecoderCommand::NONE) if (cmd != DecoderCommand::NONE)
return cmd; return cmd;
@ -940,7 +940,7 @@ MadDecoder::HandleCurrentFrame() noexcept
UpdateTimerNextFrame(); UpdateTimerNextFrame();
break; break;
case MadDecoderMuteFrame::NONE: case MadDecoderMuteFrame::NONE:
cmd = SyncAndSend(); cmd = SynthAndSubmit();
UpdateTimerNextFrame(); UpdateTimerNextFrame();
if (cmd == DecoderCommand::SEEK) { if (cmd == DecoderCommand::SEEK) {
assert(input_stream.IsSeekable()); assert(input_stream.IsSeekable());