pcm/Pcm*: drop more "Pcm" prefixes from source file names

2019-06-17 11:10:33 +02:00 · 2019-06-17 11:10:33 +02:00 · e87f0ca771
commit e87f0ca771
parent a139279575
47 changed files with 53 additions and 54 deletions
--- a/src/Main.cxx
+++ b/src/Main.cxx
@ -47,7 +47,7 @@
 #include "zeroconf/ZeroconfGlue.hxx"
 #include "decoder/DecoderList.hxx"
 #include "AudioParser.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/Convert.hxx"
 #include "unix/SignalHandlers.hxx"
 #include "thread/Slack.hxx"
 #include "net/Init.hxx"
--- a/src/decoder/Bridge.cxx
+++ b/src/decoder/Bridge.cxx
@ -22,11 +22,10 @@
 #include "Domain.hxx"
 #include "Control.hxx"
 #include "song/DetachedSong.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/Convert.hxx"
 #include "MusicPipe.hxx"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
-#include "pcm/PcmConvert.hxx"
 #include "tag/Tag.hxx"
 #include "Log.hxx"
 #include "input/InputStream.hxx"
--- a/src/decoder/plugins/FlacPcm.hxx
+++ b/src/decoder/plugins/FlacPcm.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_FLAC_PCM_HXX
 #define MPD_FLAC_PCM_HXX

-#include "pcm/PcmBuffer.hxx"
+#include "pcm/Buffer.hxx"
 #include "AudioFormat.hxx"

 #include <FLAC/ordinals.h>
--- a/src/decoder/plugins/PcmDecoderPlugin.cxx
+++ b/src/decoder/plugins/PcmDecoderPlugin.cxx
@ -22,7 +22,7 @@
 #include "PcmDecoderPlugin.hxx"
 #include "../DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
-#include "pcm/PcmPack.hxx"
+#include "pcm/Pack.hxx"
 #include "input/InputStream.hxx"
 #include "util/ByteOrder.hxx"
 #include "util/Domain.hxx"
--- a/src/encoder/plugins/FlacEncoderPlugin.cxx
+++ b/src/encoder/plugins/FlacEncoderPlugin.cxx
@ -20,7 +20,7 @@
 #include "FlacEncoderPlugin.hxx"
 #include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "pcm/PcmBuffer.hxx"
+#include "pcm/Buffer.hxx"
 #include "config/Domain.hxx"
 #include "util/DynamicFifoBuffer.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/filter/plugins/ConvertFilterPlugin.cxx
+++ b/src/filter/plugins/ConvertFilterPlugin.cxx
@ -20,7 +20,7 @@
 #include "ConvertFilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/Convert.hxx"
 #include "util/Manual.hxx"
 #include "util/ConstBuffer.hxx"
 #include "AudioFormat.hxx"
--- a/src/filter/plugins/NormalizeFilterPlugin.cxx
+++ b/src/filter/plugins/NormalizeFilterPlugin.cxx
@ -21,7 +21,7 @@
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "pcm/PcmBuffer.hxx"
+#include "pcm/Buffer.hxx"
 #include "AudioFormat.hxx"
 #include "AudioCompress/compress.h"
 #include "util/ConstBuffer.hxx"
--- a/src/filter/plugins/RouteFilterPlugin.cxx
+++ b/src/filter/plugins/RouteFilterPlugin.cxx
@ -46,7 +46,7 @@
 #include "filter/FilterPlugin.hxx"
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
-#include "pcm/PcmBuffer.hxx"
+#include "pcm/Buffer.hxx"
 #include "pcm/Silence.hxx"
 #include "util/StringStrip.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/lib/chromaprint/DecoderClient.cxx
+++ b/src/lib/chromaprint/DecoderClient.cxx
@ -18,7 +18,7 @@
 */

 #include "DecoderClient.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/Convert.hxx"
 #include "input/InputStream.hxx"
 #include "util/ConstBuffer.hxx"

--- a/src/output/Source.cxx
+++ b/src/output/Source.cxx
@ -22,7 +22,7 @@
 #include "filter/Filter.hxx"
 #include "filter/Prepared.hxx"
 #include "filter/plugins/ReplayGainFilterPlugin.hxx"
-#include "pcm/PcmMix.hxx"
+#include "pcm/Mix.hxx"
 #include "thread/Mutex.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/output/Source.hxx
+++ b/src/output/Source.hxx
@ -24,8 +24,8 @@
 #include "SharedPipeConsumer.hxx"
 #include "AudioFormat.hxx"
 #include "ReplayGainMode.hxx"
-#include "pcm/PcmBuffer.hxx"
-#include "pcm/PcmDither.hxx"
+#include "pcm/Buffer.hxx"
+#include "pcm/Dither.hxx"
 #include "thread/Mutex.hxx"
 #include "util/ConstBuffer.hxx"

--- a/src/pcm/PcmBuffer.cxx
+++ b/src/pcm/PcmBuffer.cxx
@ -17,7 +17,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"

 void *
 PcmBuffer::Get(size_t new_size) noexcept
--- a/src/pcm/PcmBuffer.hxx
+++ b/src/pcm/PcmBuffer.hxx
--- a/src/pcm/ChannelsConverter.hxx
+++ b/src/pcm/ChannelsConverter.hxx
@ -21,7 +21,7 @@
 #define MPD_PCM_CHANNELS_CONVERTER_HXX

 #include "SampleFormat.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"

 #ifndef NDEBUG
 #include <assert.h>
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@ -17,7 +17,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "PcmConvert.hxx"
+#include "Convert.hxx"
 #include "ConfiguredResampler.hxx"
 #include "util/ConstBuffer.hxx"

--- a/src/pcm/PcmConvert.hxx
+++ b/src/pcm/PcmConvert.hxx
--- a/src/pcm/PcmDither.cxx
+++ b/src/pcm/PcmDither.cxx
@ -17,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "PcmDither.hxx"
-#include "PcmPrng.hxx"
+#include "Dither.hxx"
+#include "Prng.hxx"
 #include "Traits.hxx"

 template<typename T, T MIN, T MAX, unsigned scale_bits>
--- a/src/pcm/PcmDither.hxx
+++ b/src/pcm/PcmDither.hxx
--- a/src/pcm/Dop.cxx
+++ b/src/pcm/Dop.cxx
@ -18,7 +18,7 @@
 */

 #include "Dop.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "AudioFormat.hxx"
 #include "util/ConstBuffer.hxx"

--- a/src/pcm/Dsd16.cxx
+++ b/src/pcm/Dsd16.cxx
@ -18,7 +18,7 @@
 */

 #include "Dsd16.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "util/ConstBuffer.hxx"

 /**
--- a/src/pcm/Dsd32.cxx
+++ b/src/pcm/Dsd32.cxx
@ -18,7 +18,7 @@
 */

 #include "Dsd32.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "util/ConstBuffer.hxx"

 /**
--- a/src/pcm/Export.cxx
+++ b/src/pcm/Export.cxx
@ -20,7 +20,7 @@
 #include "Export.hxx"
 #include "AudioFormat.hxx"
 #include "Order.hxx"
-#include "PcmPack.hxx"
+#include "Pack.hxx"
 #include "util/ByteReverse.hxx"
 #include "util/ConstBuffer.hxx"

--- a/src/pcm/Export.hxx
+++ b/src/pcm/Export.hxx
@ -21,7 +21,7 @@
 #define PCM_EXPORT_HXX

 #include "SampleFormat.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "config.h"

 template<typename T> struct ConstBuffer;
--- a/src/pcm/FallbackResampler.hxx
+++ b/src/pcm/FallbackResampler.hxx
@ -21,7 +21,7 @@
 #define MPD_PCM_FALLBACK_RESAMPLER_HXX

 #include "Resampler.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "AudioFormat.hxx"
 #include "util/Compiler.h"

--- a/src/pcm/FormatConverter.hxx
+++ b/src/pcm/FormatConverter.hxx
@ -21,8 +21,8 @@
 #define MPD_PCM_FORMAT_CONVERTER_HXX

 #include "SampleFormat.hxx"
-#include "PcmBuffer.hxx"
-#include "PcmDither.hxx"
+#include "Buffer.hxx"
+#include "Dither.hxx"

 #ifndef NDEBUG
 #include <assert.h>
--- a/src/pcm/LibsamplerateResampler.hxx
+++ b/src/pcm/LibsamplerateResampler.hxx
@ -21,7 +21,7 @@
 #define MPD_PCM_LIBSAMPLERATE_RESAMPLER_HXX

 #include "Resampler.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "AudioFormat.hxx"
 #include "util/Compiler.h"

--- a/src/pcm/PcmMix.cxx
+++ b/src/pcm/PcmMix.cxx
@ -17,13 +17,13 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "PcmMix.hxx"
+#include "Mix.hxx"
 #include "Volume.hxx"
 #include "Clamp.hxx"
 #include "Traits.hxx"
 #include "util/Clamp.hxx"

-#include "PcmDither.cxx" // including the .cxx file to get inlined templates
+#include "Dither.cxx" // including the .cxx file to get inlined templates

 #include <cmath>

--- a/src/pcm/PcmMix.hxx
+++ b/src/pcm/PcmMix.hxx
--- a/src/pcm/Order.cxx
+++ b/src/pcm/Order.cxx
@ -18,7 +18,7 @@
 */

 #include "Order.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "util/ConstBuffer.hxx"

 template<typename V>
--- a/src/pcm/PcmPack.cxx
+++ b/src/pcm/PcmPack.cxx
@ -17,7 +17,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "PcmPack.hxx"
+#include "Pack.hxx"
 #include "util/ByteOrder.hxx"

 static void
--- a/src/pcm/PcmPack.hxx
+++ b/src/pcm/PcmPack.hxx
--- a/src/pcm/PcmChannels.cxx
+++ b/src/pcm/PcmChannels.cxx
@ -18,7 +18,7 @@
 */

 #include "PcmChannels.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "Silence.hxx"
 #include "Traits.hxx"
 #include "AudioFormat.hxx"
--- a/src/pcm/PcmDsd.hxx
+++ b/src/pcm/PcmDsd.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_PCM_DSD_HXX
 #define MPD_PCM_DSD_HXX

-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "AudioFormat.hxx"

 #include <array>
--- a/src/pcm/PcmFormat.cxx
+++ b/src/pcm/PcmFormat.cxx
@ -18,14 +18,14 @@
 */

 #include "PcmFormat.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "Clamp.hxx"
 #include "Traits.hxx"
 #include "FloatConvert.hxx"
 #include "ShiftConvert.hxx"
 #include "util/ConstBuffer.hxx"

-#include "PcmDither.cxx" // including the .cxx file to get inlined templates
+#include "Dither.cxx" // including the .cxx file to get inlined templates

 /**
 * Wrapper for a class that converts one sample at a time into one
--- a/src/pcm/PcmPrng.hxx
+++ b/src/pcm/PcmPrng.hxx
--- a/src/pcm/SoxrResampler.hxx
+++ b/src/pcm/SoxrResampler.hxx
@ -21,7 +21,7 @@
 #define MPD_PCM_SOXR_RESAMPLER_HXX

 #include "Resampler.hxx"
-#include "PcmBuffer.hxx"
+#include "Buffer.hxx"
 #include "util/Compiler.h"

 struct AudioFormat;
--- a/src/pcm/Volume.cxx
+++ b/src/pcm/Volume.cxx
@ -24,7 +24,7 @@
 #include "util/WritableBuffer.hxx"
 #include "util/RuntimeError.hxx"

-#include "PcmDither.cxx" // including the .cxx file to get inlined templates
+#include "Dither.cxx" // including the .cxx file to get inlined templates

 #include <assert.h>
 #include <stdint.h>
--- a/src/pcm/Volume.hxx
+++ b/src/pcm/Volume.hxx
@ -21,8 +21,8 @@
 #define MPD_PCM_VOLUME_HXX

 #include "SampleFormat.hxx"
-#include "PcmBuffer.hxx"
-#include "PcmDither.hxx"
+#include "Buffer.hxx"
+#include "Dither.hxx"

 #ifndef NDEBUG
 #include <assert.h>
--- a/src/pcm/meson.build
+++ b/src/pcm/meson.build
@ -4,15 +4,15 @@ pcm_sources = [
  '../AudioParser.cxx',
  'SampleFormat.cxx',
  'Interleave.cxx',
-  'PcmBuffer.cxx',
+  'Buffer.cxx',
  'Export.cxx',
-  'PcmConvert.cxx',
+  'Convert.cxx',
  'Dop.cxx',
  'Volume.cxx',
  'Silence.cxx',
-  'PcmMix.cxx',
+  'Mix.cxx',
  'PcmChannels.cxx',
-  'PcmPack.cxx',
+  'Pack.cxx',
  'PcmFormat.cxx',
  'FormatConverter.cxx',
  'ChannelsConverter.cxx',
@ -20,7 +20,7 @@ pcm_sources = [
  'GlueResampler.cxx',
  'FallbackResampler.cxx',
  'ConfiguredResampler.cxx',
-  'PcmDither.cxx',
+  'Dither.cxx',
 ]

 if get_option('dsd')
--- a/test/RunChromaprint.cxx
+++ b/test/RunChromaprint.cxx
@ -18,7 +18,7 @@
 */

 #include "ConfigGlue.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/Convert.hxx"
 #include "lib/chromaprint/DecoderClient.hxx"
 #include "event/Thread.hxx"
 #include "decoder/DecoderList.hxx"
--- a/test/run_convert.cxx
+++ b/test/run_convert.cxx
@ -25,7 +25,7 @@

 #include "AudioParser.hxx"
 #include "AudioFormat.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/Convert.hxx"
 #include "util/ConstBuffer.hxx"
 #include "util/StaticFifoBuffer.hxx"
 #include "util/PrintException.hxx"
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@ -24,7 +24,7 @@
 #include "event/Thread.hxx"
 #include "fs/Path.hxx"
 #include "AudioParser.hxx"
-#include "pcm/PcmConvert.hxx"
+#include "pcm/Convert.hxx"
 #include "util/StringBuffer.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/ScopeExit.hxx"
--- a/test/test_pcm_channels.cxx
+++ b/test/test_pcm_channels.cxx
@ -19,7 +19,7 @@

 #include "test_pcm_util.hxx"
 #include "pcm/PcmChannels.hxx"
-#include "pcm/PcmBuffer.hxx"
+#include "pcm/Buffer.hxx"
 #include "util/ConstBuffer.hxx"

 #include <gtest/gtest.h>
--- a/test/test_pcm_dither.cxx
+++ b/test/test_pcm_dither.cxx
@ -18,7 +18,7 @@
 */

 #include "test_pcm_util.hxx"
-#include "pcm/PcmDither.cxx"
+#include "pcm/Dither.cxx"

 #include <gtest/gtest.h>

--- a/test/test_pcm_format.cxx
+++ b/test/test_pcm_format.cxx
@ -19,8 +19,8 @@

 #include "test_pcm_util.hxx"
 #include "pcm/PcmFormat.hxx"
-#include "pcm/PcmDither.hxx"
-#include "pcm/PcmBuffer.hxx"
+#include "pcm/Dither.hxx"
+#include "pcm/Buffer.hxx"
 #include "pcm/SampleFormat.hxx"

 #include <gtest/gtest.h>
--- a/test/test_pcm_mix.cxx
+++ b/test/test_pcm_mix.cxx
@ -18,8 +18,8 @@
 */

 #include "test_pcm_util.hxx"
-#include "pcm/PcmMix.hxx"
-#include "pcm/PcmDither.hxx"
+#include "pcm/Mix.hxx"
+#include "pcm/Dither.hxx"

 #include <gtest/gtest.h>

--- a/test/test_pcm_pack.cxx
+++ b/test/test_pcm_pack.cxx
@ -18,7 +18,7 @@
 */

 #include "test_pcm_util.hxx"
-#include "pcm/PcmPack.hxx"
+#include "pcm/Pack.hxx"
 #include "util/ByteOrder.hxx"

 #include <gtest/gtest.h>