oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Max Kellermann 2022-08-18 17:00:45 +02:00
parent c14484a5cc
commit b0873fbc90
28 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/filter/plugins/ReplayGainFilterPlugin.cxx
View File

@ -22,8 +22,8 @@
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
#include "tag/ReplayGainInfo.hxx" #include "tag/ReplayGainInfo.hxx"
#include "config/ReplayGainConfig.hxx" #include "config/ReplayGainConfig.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/Control.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "mixer/Listener.hxx" #include "mixer/Listener.hxx"
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"

4
src/mixer/MixerAll.cxx → src/mixer/All.cxx
View File

@ -18,8 +18,8 @@
*/ */
#include "output/MultipleOutputs.hxx" #include "output/MultipleOutputs.hxx"
#include "MixerControl.hxx" #include "Control.hxx"
#include "MixerInternal.hxx" #include "Mixer.hxx"
#include "plugins/NullMixerPlugin.hxx" #include "plugins/NullMixerPlugin.hxx"
#include "plugins/SoftwareMixerPlugin.hxx" #include "plugins/SoftwareMixerPlugin.hxx"
#include "lib/fmt/ExceptionFormatter.hxx" #include "lib/fmt/ExceptionFormatter.hxx"

4
src/mixer/MixerControl.cxx → src/mixer/Control.cxx
View File

@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "MixerControl.hxx" #include "Control.hxx"
#include "MixerInternal.hxx" #include "Mixer.hxx"
#include <cassert> #include <cassert>

0
src/mixer/MixerControl.hxx → src/mixer/Control.hxx
View File

0
src/mixer/MixerInternal.hxx → src/mixer/Mixer.hxx
View File

2
src/mixer/MixerType.cxx → src/mixer/Type.cxx
View File

@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include "MixerType.hxx" #include "Type.hxx"
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>

0
src/mixer/MixerType.hxx → src/mixer/Type.hxx
View File

6
src/mixer/meson.build
View File

@ -4,9 +4,9 @@ subdir('plugins')
mixer_glue = static_library( mixer_glue = static_library(
'mixer_glue', 'mixer_glue',
'MixerControl.cxx', 'Control.cxx',
'MixerType.cxx', 'Type.cxx',
'MixerAll.cxx', 'All.cxx',
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
log_dep, log_dep,

2
src/mixer/plugins/AlsaMixerPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "AlsaMixerPlugin.hxx" #include "AlsaMixerPlugin.hxx"
#include "lib/alsa/NonBlock.hxx" #include "lib/alsa/NonBlock.hxx"
#include "lib/alsa/Error.hxx" #include "lib/alsa/Error.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "mixer/Listener.hxx" #include "mixer/Listener.hxx"
#include "output/OutputAPI.hxx" #include "output/OutputAPI.hxx"
#include "event/MultiSocketMonitor.hxx" #include "event/MultiSocketMonitor.hxx"

2
src/mixer/plugins/AndroidMixerPlugin.cxx
View File

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

2
src/mixer/plugins/NullMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "NullMixerPlugin.hxx" #include "NullMixerPlugin.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
class NullMixer final : public Mixer { class NullMixer final : public Mixer {
/** /**

2
src/mixer/plugins/OSXMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "OSXMixerPlugin.hxx" #include "OSXMixerPlugin.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "output/plugins/OSXOutputPlugin.hxx" #include "output/plugins/OSXOutputPlugin.hxx"
class OSXMixer final : public Mixer { class OSXMixer final : public Mixer {

2
src/mixer/plugins/OssMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "OssMixerPlugin.hxx" #include "OssMixerPlugin.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "io/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"

2
src/mixer/plugins/PipeWireMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "PipeWireMixerPlugin.hxx" #include "PipeWireMixerPlugin.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "mixer/Listener.hxx" #include "mixer/Listener.hxx"
#include "output/plugins/PipeWireOutputPlugin.hxx" #include "output/plugins/PipeWireOutputPlugin.hxx"

2
src/mixer/plugins/PulseMixerPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "PulseMixerPlugin.hxx" #include "PulseMixerPlugin.hxx"
#include "lib/pulse/LogError.hxx" #include "lib/pulse/LogError.hxx"
#include "lib/pulse/LockGuard.hxx" #include "lib/pulse/LockGuard.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "mixer/Listener.hxx" #include "mixer/Listener.hxx"
#include "output/plugins/PulseOutputPlugin.hxx" #include "output/plugins/PulseOutputPlugin.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"

2
src/mixer/plugins/SndioMixerPlugin.cxx
View File

@ -17,7 +17,7 @@
*/ */
#include "SndioMixerPlugin.hxx" #include "SndioMixerPlugin.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "output/plugins/SndioOutputPlugin.hxx" #include "output/plugins/SndioOutputPlugin.hxx"
class SndioMixer final : public Mixer { class SndioMixer final : public Mixer {

2
src/mixer/plugins/SoftwareMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "SoftwareMixerPlugin.hxx" #include "SoftwareMixerPlugin.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "filter/plugins/VolumeFilterPlugin.hxx" #include "filter/plugins/VolumeFilterPlugin.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"

2
src/mixer/plugins/WasapiMixerPlugin.cxx
View File

@ -23,7 +23,7 @@
#include "output/plugins/wasapi/ForMixer.hxx" #include "output/plugins/wasapi/ForMixer.hxx"
#include "output/plugins/wasapi/AudioClient.hxx" #include "output/plugins/wasapi/AudioClient.hxx"
#include "output/plugins/wasapi/Device.hxx" #include "output/plugins/wasapi/Device.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "win32/ComPtr.hxx" #include "win32/ComPtr.hxx"
#include "win32/ComWorker.hxx" #include "win32/ComWorker.hxx"
#include "win32/HResult.hxx" #include "win32/HResult.hxx"

2
src/mixer/plugins/WinmmMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "WinmmMixerPlugin.hxx" #include "WinmmMixerPlugin.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "output/Features.h" #include "output/Features.h"
#include "output/OutputAPI.hxx" #include "output/OutputAPI.hxx"
#include "output/plugins/WinmmOutputPlugin.hxx" #include "output/plugins/WinmmOutputPlugin.hxx"

2
src/output/Control.cxx
View File

@ -22,7 +22,7 @@
#include "Client.hxx" #include "Client.hxx"
#include "Domain.hxx" #include "Domain.hxx"
#include "lib/fmt/ExceptionFormatter.hxx" #include "lib/fmt/ExceptionFormatter.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/Control.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "Log.hxx" #include "Log.hxx"

1
src/output/Defaults.cxx
View File

@ -19,7 +19,6 @@
#include "Defaults.hxx" #include "Defaults.hxx"
#include "config/Data.hxx" #include "config/Data.hxx"
#include "mixer/MixerType.hxx"
AudioOutputDefaults::AudioOutputDefaults(const ConfigData &config) AudioOutputDefaults::AudioOutputDefaults(const ConfigData &config)
:normalize(config.GetBool(ConfigOption::VOLUME_NORMALIZATION, false)), :normalize(config.GetBool(ConfigOption::VOLUME_NORMALIZATION, false)),

2
src/output/Defaults.hxx
View File

@ -20,7 +20,7 @@
#ifndef MPD_AUDIO_OUTPUT_DEFAULTS_HXX #ifndef MPD_AUDIO_OUTPUT_DEFAULTS_HXX
#define MPD_AUDIO_OUTPUT_DEFAULTS_HXX #define MPD_AUDIO_OUTPUT_DEFAULTS_HXX
#include "mixer/MixerType.hxx" #include "mixer/Type.hxx"
struct ConfigData; struct ConfigData;

2
src/output/Filtered.cxx
View File

@ -22,7 +22,7 @@
#include "Domain.hxx" #include "Domain.hxx"
#include "lib/fmt/AudioFormatFormatter.hxx" #include "lib/fmt/AudioFormatFormatter.hxx"
#include "lib/fmt/ExceptionFormatter.hxx" #include "lib/fmt/ExceptionFormatter.hxx"
#include "mixer/MixerInternal.hxx" #include "mixer/Mixer.hxx"
#include "mixer/plugins/SoftwareMixerPlugin.hxx" #include "mixer/plugins/SoftwareMixerPlugin.hxx"
#include "filter/plugins/ConvertFilterPlugin.hxx" #include "filter/plugins/ConvertFilterPlugin.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"

2
src/output/Finish.cxx
View File

@ -19,7 +19,7 @@
#include "Filtered.hxx" #include "Filtered.hxx"
#include "Interface.hxx" #include "Interface.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/Control.hxx"
#include "filter/Prepared.hxx" #include "filter/Prepared.hxx"
FilteredAudioOutput::~FilteredAudioOutput() FilteredAudioOutput::~FilteredAudioOutput()

4
src/output/Init.cxx
View File

@ -24,8 +24,8 @@
#include "Defaults.hxx" #include "Defaults.hxx"
#include "lib/fmt/ExceptionFormatter.hxx" #include "lib/fmt/ExceptionFormatter.hxx"
#include "pcm/AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "mixer/MixerType.hxx" #include "mixer/Type.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/Control.hxx"
#include "mixer/plugins/NullMixerPlugin.hxx" #include "mixer/plugins/NullMixerPlugin.hxx"
#include "mixer/plugins/SoftwareMixerPlugin.hxx" #include "mixer/plugins/SoftwareMixerPlugin.hxx"
#include "filter/LoadChain.hxx" #include "filter/LoadChain.hxx"

2
src/output/OutputCommand.cxx
View File

@ -27,7 +27,7 @@
#include "OutputCommand.hxx" #include "OutputCommand.hxx"
#include "MultipleOutputs.hxx" #include "MultipleOutputs.hxx"
#include "Client.hxx" #include "Client.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/Control.hxx"
#include "mixer/Memento.hxx" #include "mixer/Memento.hxx"
#include "Idle.hxx" #include "Idle.hxx"

2
test/read_mixer.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "NullMixerListener.hxx" #include "NullMixerListener.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/Control.hxx"
#include "mixer/plugins/AlsaMixerPlugin.hxx" #include "mixer/plugins/AlsaMixerPlugin.hxx"
#include "filter/Registry.hxx" #include "filter/Registry.hxx"
#include "event/Loop.hxx" #include "event/Loop.hxx"

2
test/run_filter.cxx
View File

@ -27,7 +27,7 @@
#include "pcm/AudioParser.hxx" #include "pcm/AudioParser.hxx"
#include "pcm/AudioFormat.hxx" #include "pcm/AudioFormat.hxx"
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/Control.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "io/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"