From fd5e74dbd058f11ef8ca015e6d2442316b6f9b5f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Sun, 16 Jun 2019 12:11:44 +0200
Subject: [PATCH] pcm/Pcm{Dop,Export}: drop "Pcm" prefix

---
 src/lib/alsa/HwSetup.hxx                | 2 +-
 src/output/plugins/AlsaOutputPlugin.cxx | 2 +-
 src/output/plugins/OSXOutputPlugin.cxx  | 2 +-
 src/output/plugins/OssOutputPlugin.cxx  | 2 +-
 src/pcm/{PcmDop.cxx => Dop.cxx}         | 2 +-
 src/pcm/{PcmDop.hxx => Dop.hxx}         | 0
 src/pcm/{PcmExport.cxx => Export.cxx}   | 4 ++--
 src/pcm/{PcmExport.hxx => Export.hxx}   | 0
 src/pcm/meson.build                     | 4 ++--
 test/test_pcm_export.cxx                | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename src/pcm/{PcmDop.cxx => Dop.cxx} (99%)
 rename src/pcm/{PcmDop.hxx => Dop.hxx} (100%)
 rename src/pcm/{PcmExport.cxx => Export.cxx} (99%)
 rename src/pcm/{PcmExport.hxx => Export.hxx} (100%)

diff --git a/src/lib/alsa/HwSetup.hxx b/src/lib/alsa/HwSetup.hxx
index b2b2fa23f..75b7fa85d 100644
--- a/src/lib/alsa/HwSetup.hxx
+++ b/src/lib/alsa/HwSetup.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_ALSA_HW_SETUP_HXX
 #define MPD_ALSA_HW_SETUP_HXX
 
-#include "pcm/PcmExport.hxx"
+#include "pcm/Export.hxx"
 
 #include <alsa/asoundlib.h>
 
diff --git a/src/output/plugins/AlsaOutputPlugin.cxx b/src/output/plugins/AlsaOutputPlugin.cxx
index a967a3865..8965f92a6 100644
--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -26,7 +26,7 @@
 #include "lib/alsa/Version.hxx"
 #include "../OutputAPI.hxx"
 #include "mixer/MixerList.hxx"
-#include "pcm/PcmExport.hxx"
+#include "pcm/Export.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
 #include "util/Manual.hxx"
diff --git a/src/output/plugins/OSXOutputPlugin.cxx b/src/output/plugins/OSXOutputPlugin.cxx
index 02b9c8021..dfbfa69c2 100644
--- a/src/output/plugins/OSXOutputPlugin.cxx
+++ b/src/output/plugins/OSXOutputPlugin.cxx
@@ -26,7 +26,7 @@
 #include "util/Domain.hxx"
 #include "util/Manual.hxx"
 #include "util/ConstBuffer.hxx"
-#include "pcm/PcmExport.hxx"
+#include "pcm/Export.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
 #include "util/ByteOrder.hxx"
diff --git a/src/output/plugins/OssOutputPlugin.cxx b/src/output/plugins/OssOutputPlugin.cxx
index 591b081c5..da3477bf4 100644
--- a/src/output/plugins/OssOutputPlugin.cxx
+++ b/src/output/plugins/OssOutputPlugin.cxx
@@ -54,7 +54,7 @@
 #endif
 
 #ifdef AFMT_S24_PACKED
-#include "pcm/PcmExport.hxx"
+#include "pcm/Export.hxx"
 #include "util/Manual.hxx"
 #endif
 
diff --git a/src/pcm/PcmDop.cxx b/src/pcm/Dop.cxx
similarity index 99%
rename from src/pcm/PcmDop.cxx
rename to src/pcm/Dop.cxx
index a0a6bdae6..671abd2e6 100644
--- a/src/pcm/PcmDop.cxx
+++ b/src/pcm/Dop.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "PcmDop.hxx"
+#include "Dop.hxx"
 #include "PcmBuffer.hxx"
 #include "AudioFormat.hxx"
 #include "util/ConstBuffer.hxx"
diff --git a/src/pcm/PcmDop.hxx b/src/pcm/Dop.hxx
similarity index 100%
rename from src/pcm/PcmDop.hxx
rename to src/pcm/Dop.hxx
diff --git a/src/pcm/PcmExport.cxx b/src/pcm/Export.cxx
similarity index 99%
rename from src/pcm/PcmExport.cxx
rename to src/pcm/Export.cxx
index 7d2f18588..32f72318c 100644
--- a/src/pcm/PcmExport.cxx
+++ b/src/pcm/Export.cxx
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "PcmExport.hxx"
+#include "Export.hxx"
 #include "AudioFormat.hxx"
 #include "Order.hxx"
 #include "PcmPack.hxx"
@@ -28,7 +28,7 @@
 #include "Dsd16.hxx"
 #include "Dsd32.hxx"
 #include "PcmDsd.hxx"
-#include "PcmDop.hxx"
+#include "Dop.hxx"
 #endif
 
 #include <assert.h>
diff --git a/src/pcm/PcmExport.hxx b/src/pcm/Export.hxx
similarity index 100%
rename from src/pcm/PcmExport.hxx
rename to src/pcm/Export.hxx
diff --git a/src/pcm/meson.build b/src/pcm/meson.build
index e7ac5433b..40a3925f0 100644
--- a/src/pcm/meson.build
+++ b/src/pcm/meson.build
@@ -5,9 +5,9 @@ pcm_sources = [
   'SampleFormat.cxx',
   'Interleave.cxx',
   'PcmBuffer.cxx',
-  'PcmExport.cxx',
+  'Export.cxx',
   'PcmConvert.cxx',
-  'PcmDop.cxx',
+  'Dop.cxx',
   'Volume.cxx',
   'Silence.cxx',
   'PcmMix.cxx',
diff --git a/test/test_pcm_export.cxx b/test/test_pcm_export.cxx
index e53cba931..9d4c7c809 100644
--- a/test/test_pcm_export.cxx
+++ b/test/test_pcm_export.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "pcm/PcmExport.hxx"
+#include "pcm/Export.hxx"
 #include "pcm/Traits.hxx"
 #include "util/ByteOrder.hxx"
 #include "util/ConstBuffer.hxx"