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

pcm/Export: rename GetFrameSize() to GetOutputFrameSize()

Browse Source
This commit is contained in:
Max Kellermann 2019-06-26 15:45:44 +02:00
parent e69fd0300a
commit 2f243f2295
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -674,7 +674,7 @@ AlsaOutput::Open(AudioFormat &audio_format)
#ifndef NDEBUG #ifndef NDEBUG
in_frame_size = audio_format.GetFrameSize(); in_frame_size = audio_format.GetFrameSize();
#endif #endif
out_frame_size = pcm_export->GetFrameSize(); out_frame_size = pcm_export->GetOutputFrameSize();
drain = false; drain = false;

2
src/output/plugins/OSXOutputPlugin.cxx
View File

@ -856,7 +856,7 @@ OSXOutput::Open(AudioFormat &audio_format)
if (dop_enabled) { if (dop_enabled) {
pcm_export->Open(audio_format.format, audio_format.channels, params); pcm_export->Open(audio_format.format, audio_format.channels, params);
ring_buffer_size = std::max<size_t>(buffer_frame_size, ring_buffer_size = std::max<size_t>(buffer_frame_size,
MPD_OSX_BUFFER_TIME_MS * pcm_export->GetFrameSize() * asbd.mSampleRate / 1000); MPD_OSX_BUFFER_TIME_MS * pcm_export->GetOutputFrameSize() * asbd.mSampleRate / 1000);
} }
#endif #endif
ring_buffer = new boost::lockfree::spsc_queue<uint8_t>(ring_buffer_size); ring_buffer = new boost::lockfree::spsc_queue<uint8_t>(ring_buffer_size);

2
src/pcm/Export.cxx
View File

@ -115,7 +115,7 @@ PcmExport::Reset() noexcept
} }
size_t size_t
PcmExport::GetFrameSize() const noexcept PcmExport::GetOutputFrameSize() const noexcept
{ {
if (pack24) if (pack24)
/* packed 24 bit samples (3 bytes per sample) */ /* packed 24 bit samples (3 bytes per sample) */

2
src/pcm/Export.hxx
View File

@ -188,7 +188,7 @@ public:
* Calculate the size of one output frame. * Calculate the size of one output frame.
*/ */
gcc_pure gcc_pure
size_t GetFrameSize() const noexcept; size_t GetOutputFrameSize() const noexcept;
/** /**
* Export a PCM buffer. * Export a PCM buffer.