From e69fd0300ab0afcb880949e77e053a655ee30bfc Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 26 Jun 2019 15:46:05 +0200 Subject: [PATCH] pcm/Export: rename CalcSourceSize() to CalcInputSize() --- src/output/plugins/AlsaOutputPlugin.cxx | 2 +- src/output/plugins/OSXOutputPlugin.cxx | 2 +- src/output/plugins/OssOutputPlugin.cxx | 2 +- src/pcm/Export.cxx | 2 +- src/pcm/Export.hxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx index fe6a71d93..262dbf39e 100644 --- a/src/output/plugins/AlsaOutputPlugin.cxx +++ b/src/output/plugins/AlsaOutputPlugin.cxx @@ -884,7 +884,7 @@ AlsaOutput::Play(const void *chunk, size_t size) size_t bytes_written = ring_buffer->push((const uint8_t *)e.data, e.size); if (bytes_written > 0) - return pcm_export->CalcSourceSize(bytes_written); + return pcm_export->CalcInputSize(bytes_written); /* now that the ring_buffer is full, we can activate the socket handlers to trigger the first diff --git a/src/output/plugins/OSXOutputPlugin.cxx b/src/output/plugins/OSXOutputPlugin.cxx index bc3e6ff31..c4085059a 100644 --- a/src/output/plugins/OSXOutputPlugin.cxx +++ b/src/output/plugins/OSXOutputPlugin.cxx @@ -890,7 +890,7 @@ OSXOutput::Play(const void *chunk, size_t size) return size; size_t bytes_written = ring_buffer->push((const uint8_t *)e.data, e.size); - return pcm_export->CalcSourceSize(bytes_written); + return pcm_export->CalcInputSize(bytes_written); } #endif return ring_buffer->push((const uint8_t *)chunk, size); diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx index 5a4ee2049..dee0a1e71 100644 --- a/src/output/plugins/OssOutputPlugin.cxx +++ b/src/output/plugins/OssOutputPlugin.cxx @@ -681,7 +681,7 @@ OssOutput::Play(const void *chunk, size_t size) ret = fd.Write(chunk, size); if (ret > 0) { #ifdef AFMT_S24_PACKED - ret = pcm_export->CalcSourceSize(ret); + ret = pcm_export->CalcInputSize(ret); #endif return ret; } diff --git a/src/pcm/Export.cxx b/src/pcm/Export.cxx index d149643c1..95a818a8e 100644 --- a/src/pcm/Export.cxx +++ b/src/pcm/Export.cxx @@ -266,7 +266,7 @@ PcmExport::Export(ConstBuffer data) noexcept } size_t -PcmExport::CalcSourceSize(size_t size) const noexcept +PcmExport::CalcInputSize(size_t size) const noexcept { if (pack24) /* 32 bit to 24 bit conversion (4 to 3 bytes) */ diff --git a/src/pcm/Export.hxx b/src/pcm/Export.hxx index 9ffca3b3a..68952694f 100644 --- a/src/pcm/Export.hxx +++ b/src/pcm/Export.hxx @@ -205,7 +205,7 @@ public: * pcm_export() source buffer. */ gcc_pure - size_t CalcSourceSize(size_t dest_size) const noexcept; + size_t CalcInputSize(size_t dest_size) const noexcept; }; #endif