mixer/Mixer*: drop the "Mixer" prefix from source files

2022-08-18 17:00:45 +02:00 · 2022-08-18 17:00:45 +02:00 · b0873fbc90
commit b0873fbc90
parent c14484a5cc
28 changed files with 30 additions and 31 deletions
--- a/src/filter/plugins/ReplayGainFilterPlugin.cxx
+++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx
@ -22,8 +22,8 @@
 #include "filter/Prepared.hxx"
 #include "tag/ReplayGainInfo.hxx"
 #include "config/ReplayGainConfig.hxx"
-#include "mixer/MixerControl.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Control.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "pcm/AudioFormat.hxx"
 #include "pcm/Volume.hxx"
--- a/src/mixer/MixerAll.cxx
+++ b/src/mixer/MixerAll.cxx
@ -18,8 +18,8 @@
 */

 #include "output/MultipleOutputs.hxx"
-#include "MixerControl.hxx"
-#include "MixerInternal.hxx"
+#include "Control.hxx"
+#include "Mixer.hxx"
 #include "plugins/NullMixerPlugin.hxx"
 #include "plugins/SoftwareMixerPlugin.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
--- a/src/mixer/MixerControl.cxx
+++ b/src/mixer/MixerControl.cxx
@ -17,8 +17,8 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "MixerControl.hxx"
-#include "MixerInternal.hxx"
+#include "Control.hxx"
+#include "Mixer.hxx"

 #include <cassert>

--- a/src/mixer/MixerControl.hxx
+++ b/src/mixer/MixerControl.hxx
--- a/src/mixer/MixerInternal.hxx
+++ b/src/mixer/MixerInternal.hxx
--- a/src/mixer/MixerType.cxx
+++ b/src/mixer/MixerType.cxx
@ -17,7 +17,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

-#include "MixerType.hxx"
+#include "Type.hxx"

 #include <cassert>
 #include <stdexcept>
--- a/src/mixer/MixerType.hxx
+++ b/src/mixer/MixerType.hxx
--- a/src/mixer/meson.build
+++ b/src/mixer/meson.build
@ -4,9 +4,9 @@ subdir('plugins')

 mixer_glue = static_library(
  'mixer_glue',
-  'MixerControl.cxx',
-  'MixerType.cxx',
-  'MixerAll.cxx',
+  'Control.cxx',
+  'Type.cxx',
+  'All.cxx',
  include_directories: inc,
  dependencies: [
    log_dep,
--- a/src/mixer/plugins/AlsaMixerPlugin.cxx
+++ b/src/mixer/plugins/AlsaMixerPlugin.cxx
@ -20,7 +20,7 @@
 #include "AlsaMixerPlugin.hxx"
 #include "lib/alsa/NonBlock.hxx"
 #include "lib/alsa/Error.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "output/OutputAPI.hxx"
 #include "event/MultiSocketMonitor.hxx"
--- a/src/mixer/plugins/AndroidMixerPlugin.cxx
+++ b/src/mixer/plugins/AndroidMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "AndroidMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "pcm/Volume.hxx"
 #include "android/Context.hxx"
--- a/src/mixer/plugins/NullMixerPlugin.cxx
+++ b/src/mixer/plugins/NullMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "NullMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"

 class NullMixer final : public Mixer {
 	/**
--- a/src/mixer/plugins/OSXMixerPlugin.cxx
+++ b/src/mixer/plugins/OSXMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "OSXMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "output/plugins/OSXOutputPlugin.hxx"

 class OSXMixer final : public Mixer {
--- a/src/mixer/plugins/OssMixerPlugin.cxx
+++ b/src/mixer/plugins/OssMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "OssMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "config/Block.hxx"
 #include "io/FileDescriptor.hxx"
 #include "system/Error.hxx"
--- a/src/mixer/plugins/PipeWireMixerPlugin.cxx
+++ b/src/mixer/plugins/PipeWireMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "PipeWireMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "output/plugins/PipeWireOutputPlugin.hxx"

--- a/src/mixer/plugins/PulseMixerPlugin.cxx
+++ b/src/mixer/plugins/PulseMixerPlugin.cxx
@ -20,7 +20,7 @@
 #include "PulseMixerPlugin.hxx"
 #include "lib/pulse/LogError.hxx"
 #include "lib/pulse/LockGuard.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/Listener.hxx"
 #include "output/plugins/PulseOutputPlugin.hxx"
 #include "util/NumberParser.hxx"
--- a/src/mixer/plugins/SndioMixerPlugin.cxx
+++ b/src/mixer/plugins/SndioMixerPlugin.cxx
@ -17,7 +17,7 @@
 */

 #include "SndioMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "output/plugins/SndioOutputPlugin.hxx"

 class SndioMixer final : public Mixer {
--- a/src/mixer/plugins/SoftwareMixerPlugin.cxx
+++ b/src/mixer/plugins/SoftwareMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "SoftwareMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "filter/plugins/VolumeFilterPlugin.hxx"
 #include "pcm/Volume.hxx"

--- a/src/mixer/plugins/WasapiMixerPlugin.cxx
+++ b/src/mixer/plugins/WasapiMixerPlugin.cxx
@ -23,7 +23,7 @@
 #include "output/plugins/wasapi/ForMixer.hxx"
 #include "output/plugins/wasapi/AudioClient.hxx"
 #include "output/plugins/wasapi/Device.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "win32/ComPtr.hxx"
 #include "win32/ComWorker.hxx"
 #include "win32/HResult.hxx"
--- a/src/mixer/plugins/WinmmMixerPlugin.cxx
+++ b/src/mixer/plugins/WinmmMixerPlugin.cxx
@ -18,7 +18,7 @@
 */

 #include "WinmmMixerPlugin.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "output/Features.h"
 #include "output/OutputAPI.hxx"
 #include "output/plugins/WinmmOutputPlugin.hxx"
--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
@ -22,7 +22,7 @@
 #include "Client.hxx"
 #include "Domain.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "config/Block.hxx"
 #include "Log.hxx"

--- a/src/output/Defaults.cxx
+++ b/src/output/Defaults.cxx
@ -19,7 +19,6 @@

 #include "Defaults.hxx"
 #include "config/Data.hxx"
-#include "mixer/MixerType.hxx"

 AudioOutputDefaults::AudioOutputDefaults(const ConfigData &config)
 	:normalize(config.GetBool(ConfigOption::VOLUME_NORMALIZATION, false)),
--- a/src/output/Defaults.hxx
+++ b/src/output/Defaults.hxx
@ -20,7 +20,7 @@
 #ifndef MPD_AUDIO_OUTPUT_DEFAULTS_HXX
 #define MPD_AUDIO_OUTPUT_DEFAULTS_HXX

-#include "mixer/MixerType.hxx"
+#include "mixer/Type.hxx"

 struct ConfigData;

--- a/src/output/Filtered.cxx
+++ b/src/output/Filtered.cxx
@ -22,7 +22,7 @@
 #include "Domain.hxx"
 #include "lib/fmt/AudioFormatFormatter.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
-#include "mixer/MixerInternal.hxx"
+#include "mixer/Mixer.hxx"
 #include "mixer/plugins/SoftwareMixerPlugin.hxx"
 #include "filter/plugins/ConvertFilterPlugin.hxx"
 #include "util/RuntimeError.hxx"
--- a/src/output/Finish.cxx
+++ b/src/output/Finish.cxx
@ -19,7 +19,7 @@

 #include "Filtered.hxx"
 #include "Interface.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "filter/Prepared.hxx"

 FilteredAudioOutput::~FilteredAudioOutput()
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@ -24,8 +24,8 @@
 #include "Defaults.hxx"
 #include "lib/fmt/ExceptionFormatter.hxx"
 #include "pcm/AudioParser.hxx"
-#include "mixer/MixerType.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Type.hxx"
+#include "mixer/Control.hxx"
 #include "mixer/plugins/NullMixerPlugin.hxx"
 #include "mixer/plugins/SoftwareMixerPlugin.hxx"
 #include "filter/LoadChain.hxx"
--- a/src/output/OutputCommand.cxx
+++ b/src/output/OutputCommand.cxx
@ -27,7 +27,7 @@
 #include "OutputCommand.hxx"
 #include "MultipleOutputs.hxx"
 #include "Client.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "mixer/Memento.hxx"
 #include "Idle.hxx"

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

 #include "NullMixerListener.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "mixer/plugins/AlsaMixerPlugin.hxx"
 #include "filter/Registry.hxx"
 #include "event/Loop.hxx"
--- a/test/run_filter.cxx
+++ b/test/run_filter.cxx
@ -27,7 +27,7 @@
 #include "pcm/AudioParser.hxx"
 #include "pcm/AudioFormat.hxx"
 #include "pcm/Volume.hxx"
-#include "mixer/MixerControl.hxx"
+#include "mixer/Control.hxx"
 #include "system/Error.hxx"
 #include "io/FileDescriptor.hxx"
 #include "util/StringBuffer.hxx"