summaryrefslogtreecommitdiff
path: root/src/decoder
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2019-08-03 11:32:42 +0200
committerMax Kellermann <max@musicpd.org>2019-08-03 11:32:42 +0200
commit9d0fe725ebb3a8567f1c12d7c7036e987404ca44 (patch)
treefe37aa67949e3a0c07040d5baf6924d5e7c3f777 /src/decoder
parent8a432c9b7f9808ccd168d8e33be3f828ec316cec (diff)
decoder/mad: rename a few misnamed methods
Diffstat (limited to 'src/decoder')
-rw-r--r--src/decoder/plugins/MadDecoderPlugin.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index a73716cb1..3e6fc7b11 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -194,13 +194,13 @@ private:
* Sends the synthesized current frame via
* 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
* DecoderClient::SubmitData().
*/
- DecoderCommand SyncAndSend() noexcept;
+ DecoderCommand SynthAndSubmit() noexcept;
/**
* @return false to stop decoding
@@ -845,7 +845,7 @@ MadDecoder::UpdateTimerNextFrame() noexcept
}
DecoderCommand
-MadDecoder::SendPCM(unsigned i, unsigned pcm_length) noexcept
+MadDecoder::SubmitPCM(unsigned i, unsigned pcm_length) noexcept
{
unsigned max_samples = sizeof(output_buffer) /
sizeof(output_buffer[0]) /
@@ -874,7 +874,7 @@ MadDecoder::SendPCM(unsigned i, unsigned pcm_length) noexcept
}
inline DecoderCommand
-MadDecoder::SyncAndSend() noexcept
+MadDecoder::SynthAndSubmit() noexcept
{
mad_synth_frame(&synth, &frame);
@@ -912,7 +912,7 @@ MadDecoder::SyncAndSend() noexcept
pcm_length -= drop_end_samples;
}
- auto cmd = SendPCM(i, pcm_length);
+ auto cmd = SubmitPCM(i, pcm_length);
if (cmd != DecoderCommand::NONE)
return cmd;
@@ -940,7 +940,7 @@ MadDecoder::HandleCurrentFrame() noexcept
UpdateTimerNextFrame();
break;
case MadDecoderMuteFrame::NONE:
- cmd = SyncAndSend();
+ cmd = SynthAndSubmit();
UpdateTimerNextFrame();
if (cmd == DecoderCommand::SEEK) {
assert(input_stream.IsSeekable());