aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--src/MixerAll.cxx2
-rw-r--r--src/filter/ReplayGainFilterPlugin.cxx2
-rw-r--r--src/filter/VolumeFilterPlugin.cxx2
-rw-r--r--src/mixer/SoftwareMixerPlugin.cxx2
-rw-r--r--src/pcm/PcmMix.cxx2
-rw-r--r--src/pcm/Volume.cxx (renamed from src/pcm/PcmVolume.cxx)2
-rw-r--r--src/pcm/Volume.hxx (renamed from src/pcm/PcmVolume.hxx)0
-rw-r--r--test/read_mixer.cxx2
-rw-r--r--test/run_filter.cxx2
-rw-r--r--test/software_volume.cxx2
-rw-r--r--test/test_pcm_volume.cxx2
12 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 93bc71351..767b4dcf2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -339,7 +339,7 @@ libpcm_a_SOURCES = \
src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h \
src/pcm/PcmDsd.cxx src/pcm/PcmDsd.hxx \
src/pcm/PcmDsdUsb.cxx src/pcm/PcmDsdUsb.hxx \
- src/pcm/PcmVolume.cxx src/pcm/PcmVolume.hxx \
+ src/pcm/Volume.cxx src/pcm/Volume.hxx \
src/pcm/PcmMix.cxx src/pcm/PcmMix.hxx \
src/pcm/PcmChannels.cxx src/pcm/PcmChannels.hxx \
src/pcm/PcmPack.cxx src/pcm/PcmPack.hxx \
diff --git a/src/MixerAll.cxx b/src/MixerAll.cxx
index 37225fd25..2eb54c232 100644
--- a/src/MixerAll.cxx
+++ b/src/MixerAll.cxx
@@ -23,7 +23,7 @@
#include "MixerInternal.hxx"
#include "MixerList.hxx"
#include "OutputAll.hxx"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "OutputInternal.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx
index b2dcde4cc..c6c3cc2aa 100644
--- a/src/filter/ReplayGainFilterPlugin.cxx
+++ b/src/filter/ReplayGainFilterPlugin.cxx
@@ -26,7 +26,7 @@
#include "ReplayGainInfo.hxx"
#include "ReplayGainConfig.hxx"
#include "MixerControl.hxx"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "pcm/PcmBuffer.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/VolumeFilterPlugin.cxx
index 1b663f6eb..2438e0336 100644
--- a/src/filter/VolumeFilterPlugin.cxx
+++ b/src/filter/VolumeFilterPlugin.cxx
@@ -22,7 +22,7 @@
#include "FilterPlugin.hxx"
#include "FilterInternal.hxx"
#include "FilterRegistry.hxx"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "pcm/PcmBuffer.hxx"
#include "AudioFormat.hxx"
#include "util/Error.hxx"
diff --git a/src/mixer/SoftwareMixerPlugin.cxx b/src/mixer/SoftwareMixerPlugin.cxx
index 193e68f23..e5f4b1659 100644
--- a/src/mixer/SoftwareMixerPlugin.cxx
+++ b/src/mixer/SoftwareMixerPlugin.cxx
@@ -24,7 +24,7 @@
#include "FilterRegistry.hxx"
#include "FilterInternal.hxx"
#include "filter/VolumeFilterPlugin.hxx"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "ConfigData.hxx"
#include "util/Error.hxx"
diff --git a/src/pcm/PcmMix.cxx b/src/pcm/PcmMix.cxx
index ffe935a0f..caf7fe516 100644
--- a/src/pcm/PcmMix.cxx
+++ b/src/pcm/PcmMix.cxx
@@ -19,7 +19,7 @@
#include "config.h"
#include "PcmMix.hxx"
-#include "PcmVolume.hxx"
+#include "Volume.hxx"
#include "PcmUtils.hxx"
#include "AudioFormat.hxx"
#include "Traits.hxx"
diff --git a/src/pcm/PcmVolume.cxx b/src/pcm/Volume.cxx
index 5c0a1fbd3..eaba84a59 100644
--- a/src/pcm/PcmVolume.cxx
+++ b/src/pcm/Volume.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "PcmVolume.hxx"
+#include "Volume.hxx"
#include "PcmUtils.hxx"
#include "Traits.hxx"
#include "AudioFormat.hxx"
diff --git a/src/pcm/PcmVolume.hxx b/src/pcm/Volume.hxx
index 52102a294..52102a294 100644
--- a/src/pcm/PcmVolume.hxx
+++ b/src/pcm/Volume.hxx
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index 8426443ae..07ff931c8 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -21,7 +21,7 @@
#include "MixerControl.hxx"
#include "MixerList.hxx"
#include "FilterRegistry.hxx"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "GlobalEvents.hxx"
#include "Main.hxx"
#include "event/Loop.hxx"
diff --git a/test/run_filter.cxx b/test/run_filter.cxx
index 085fc256b..a35429bc8 100644
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@@ -25,7 +25,7 @@
#include "AudioFormat.hxx"
#include "FilterPlugin.hxx"
#include "FilterInternal.hxx"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "MixerControl.hxx"
#include "stdbin.h"
#include "util/Error.hxx"
diff --git a/test/software_volume.cxx b/test/software_volume.cxx
index 19a0be88c..b850217df 100644
--- a/test/software_volume.cxx
+++ b/test/software_volume.cxx
@@ -24,7 +24,7 @@
*/
#include "config.h"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "AudioParser.hxx"
#include "AudioFormat.hxx"
#include "util/Error.hxx"
diff --git a/test/test_pcm_volume.cxx b/test/test_pcm_volume.cxx
index 764d8b127..fae937c30 100644
--- a/test/test_pcm_volume.cxx
+++ b/test/test_pcm_volume.cxx
@@ -18,7 +18,7 @@
*/
#include "test_pcm_all.hxx"
-#include "pcm/PcmVolume.hxx"
+#include "pcm/Volume.hxx"
#include "test_pcm_util.hxx"
#include <algorithm>