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

Mixer*: move to mixer/

This commit is contained in:
Max Kellermann 2014-01-24 16:25:21 +01:00
parent 7c52a1c04b
commit 68eda78704
36 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile.am
View File

@ -209,7 +209,7 @@ src_mpd_SOURCES = \
src/TagSave.cxx src/TagSave.hxx \
src/TagFile.cxx src/TagFile.hxx \
src/TagStream.cxx src/TagStream.hxx \
src/Volume.cxx src/Volume.hxx \
src/mixer/Volume.cxx src/mixer/Volume.hxx \
src/SongFilter.cxx src/SongFilter.hxx \
src/PlaylistFile.cxx src/PlaylistFile.hxx \
src/Timer.cxx
@ -935,16 +935,16 @@ MIXER_LIBS = \
$(PULSE_LIBS)
MIXER_API_SRC = \
src/MixerPlugin.hxx \
src/MixerList.hxx \
src/MixerControl.cxx src/MixerControl.hxx \
src/MixerType.cxx src/MixerType.hxx \
src/MixerAll.cxx src/MixerAll.hxx \
src/MixerInternal.hxx
src/mixer/MixerPlugin.hxx \
src/mixer/MixerList.hxx \
src/mixer/MixerControl.cxx src/mixer/MixerControl.hxx \
src/mixer/MixerType.cxx src/mixer/MixerType.hxx \
src/mixer/MixerAll.cxx src/mixer/MixerAll.hxx \
src/mixer/MixerInternal.hxx
libmixer_plugins_a_SOURCES = \
src/mixer/SoftwareMixerPlugin.cxx \
src/mixer/SoftwareMixerPlugin.hxx
src/mixer/plugins/SoftwareMixerPlugin.cxx \
src/mixer/plugins/SoftwareMixerPlugin.hxx
libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(ALSA_CFLAGS) \
$(PULSE_CFLAGS)
@ -953,14 +953,14 @@ if HAVE_ALSA
liboutput_plugins_a_SOURCES += \
src/output/plugins/AlsaOutputPlugin.cxx \
src/output/plugins/AlsaOutputPlugin.hxx
libmixer_plugins_a_SOURCES += src/mixer/AlsaMixerPlugin.cxx
libmixer_plugins_a_SOURCES += src/mixer/plugins/AlsaMixerPlugin.cxx
endif
if HAVE_ROAR
liboutput_plugins_a_SOURCES += \
src/output/plugins/RoarOutputPlugin.cxx \
src/output/plugins/RoarOutputPlugin.hxx
libmixer_plugins_a_SOURCES += src/mixer/RoarMixerPlugin.cxx
libmixer_plugins_a_SOURCES += src/mixer/plugins/RoarMixerPlugin.cxx
endif
if HAVE_AO
@ -991,7 +991,7 @@ if HAVE_OSS
liboutput_plugins_a_SOURCES += \
src/output/plugins/OssOutputPlugin.cxx \
src/output/plugins/OssOutputPlugin.hxx
libmixer_plugins_a_SOURCES += src/mixer/OssMixerPlugin.cxx
libmixer_plugins_a_SOURCES += src/mixer/plugins/OssMixerPlugin.cxx
endif
if HAVE_OPENAL
@ -1011,7 +1011,7 @@ liboutput_plugins_a_SOURCES += \
src/output/plugins/PulseOutputPlugin.cxx \
src/output/plugins/PulseOutputPlugin.hxx
libmixer_plugins_a_SOURCES += \
src/mixer/PulseMixerPlugin.cxx src/mixer/PulseMixerPlugin.hxx
src/mixer/plugins/PulseMixerPlugin.cxx src/mixer/plugins/PulseMixerPlugin.hxx
endif
if HAVE_SHOUT
@ -1045,7 +1045,7 @@ if ENABLE_WINMM_OUTPUT
liboutput_plugins_a_SOURCES += \
src/output/plugins/WinmmOutputPlugin.cxx \
src/output/plugins/WinmmOutputPlugin.hxx
libmixer_plugins_a_SOURCES += src/mixer/WinmmMixerPlugin.cxx
libmixer_plugins_a_SOURCES += src/mixer/plugins/WinmmMixerPlugin.cxx
endif
@ -1540,8 +1540,8 @@ test_run_output_SOURCES = test/run_output.cxx \
src/output/OutputError.cxx \
src/output/OutputInit.cxx src/output/OutputFinish.cxx src/output/OutputList.cxx \
src/output/OutputPlugin.cxx \
src/MixerControl.cxx \
src/MixerType.cxx \
src/mixer/MixerControl.cxx \
src/mixer/MixerType.cxx \
src/filter/FilterPlugin.cxx \
src/filter/FilterConfig.cxx \
src/AudioCompress/compress.c \
@ -1559,7 +1559,7 @@ test_read_mixer_LDADD = \
$(GLIB_LIBS)
test_read_mixer_SOURCES = test/read_mixer.cxx \
src/Log.cxx src/LogBackend.cxx \
src/MixerControl.cxx \
src/mixer/MixerControl.cxx \
src/filter/FilterPlugin.cxx \
src/AudioFormat.cxx \
src/filter/plugins/VolumeFilterPlugin.cxx

2
src/Main.cxx
View File

@ -36,7 +36,7 @@
#include "client/ClientList.hxx"
#include "command/AllCommands.hxx"
#include "Partition.hxx"
#include "Volume.hxx"
#include "mixer/Volume.hxx"
#include "output/OutputAll.hxx"
#include "tag/TagConfig.hxx"
#include "ReplayGainConfig.hxx"

2
src/StateFile.cxx
View File

@ -23,7 +23,7 @@
#include "PlaylistState.hxx"
#include "fs/TextFile.hxx"
#include "Partition.hxx"
#include "Volume.hxx"
#include "mixer/Volume.hxx"
#include "fs/FileSystem.hxx"
#include "util/Domain.hxx"

2
src/command/OtherCommands.cxx
View File

@ -34,7 +34,7 @@
#include "protocol/ArgParser.hxx"
#include "protocol/Result.hxx"
#include "ls.hxx"
#include "Volume.hxx"
#include "mixer/Volume.hxx"
#include "util/ASCII.hxx"
#include "util/UriUtil.hxx"
#include "util/Error.hxx"

2
src/command/PlayerCommands.cxx
View File

@ -24,7 +24,7 @@
#include "PlaylistPrint.hxx"
#include "db/update/UpdateGlue.hxx"
#include "client/Client.hxx"
#include "Volume.hxx"
#include "mixer/Volume.hxx"
#include "output/OutputAll.hxx"
#include "Partition.hxx"
#include "protocol/Result.hxx"

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

@ -25,7 +25,7 @@
#include "AudioFormat.hxx"
#include "ReplayGainInfo.hxx"
#include "ReplayGainConfig.hxx"
#include "MixerControl.hxx"
#include "mixer/MixerControl.hxx"
#include "pcm/Volume.hxx"
#include "pcm/PcmBuffer.hxx"
#include "util/ConstBuffer.hxx"

0
src/MixerAll.cxx → src/mixer/MixerAll.cxx
View File

0
src/MixerAll.hxx → src/mixer/MixerAll.hxx
View File

0
src/MixerControl.cxx → src/mixer/MixerControl.cxx
View File

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

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

0
src/MixerList.hxx → src/mixer/MixerList.hxx
View File

0
src/MixerPlugin.hxx → src/mixer/MixerPlugin.hxx
View File

0
src/MixerType.cxx → src/mixer/MixerType.cxx
View File

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

0
src/Volume.cxx → src/mixer/Volume.cxx
View File

0
src/Volume.hxx → src/mixer/Volume.hxx
View File

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

@ -18,7 +18,7 @@
*/
#include "config.h"
#include "MixerInternal.hxx"
#include "mixer/MixerInternal.hxx"
#include "output/OutputAPI.hxx"
#include "GlobalEvents.hxx"
#include "Main.hxx"

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

@ -18,7 +18,7 @@
*/
#include "config.h"
#include "MixerInternal.hxx"
#include "mixer/MixerInternal.hxx"
#include "config/ConfigData.hxx"
#include "system/fd_util.h"
#include "util/ASCII.hxx"

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

@ -19,7 +19,7 @@
#include "config.h"
#include "PulseMixerPlugin.hxx"
#include "MixerInternal.hxx"
#include "mixer/MixerInternal.hxx"
#include "output/plugins/PulseOutputPlugin.hxx"
#include "GlobalEvents.hxx"
#include "util/Error.hxx"

0
src/mixer/PulseMixerPlugin.hxx → src/mixer/plugins/PulseMixerPlugin.hxx
View File

2
src/mixer/RoarMixerPlugin.cxx → src/mixer/plugins/RoarMixerPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "MixerInternal.hxx"
#include "mixer/MixerInternal.hxx"
#include "output/plugins/RoarOutputPlugin.hxx"
#include "Compiler.h"

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

@ -19,7 +19,7 @@
#include "config.h"
#include "SoftwareMixerPlugin.hxx"
#include "MixerInternal.hxx"
#include "mixer/MixerInternal.hxx"
#include "filter/FilterPlugin.hxx"
#include "filter/FilterRegistry.hxx"
#include "filter/FilterInternal.hxx"

0
src/mixer/SoftwareMixerPlugin.hxx → src/mixer/plugins/SoftwareMixerPlugin.hxx
View File

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

@ -18,7 +18,7 @@
*/
#include "config.h"
#include "MixerInternal.hxx"
#include "mixer/MixerInternal.hxx"
#include "output/OutputAPI.hxx"
#include "output/plugins/WinmmOutputPlugin.hxx"
#include "util/Error.hxx"

2
src/output/OutputCommand.cxx
View File

@ -29,7 +29,7 @@
#include "OutputAll.hxx"
#include "OutputInternal.hxx"
#include "PlayerControl.hxx"
#include "MixerControl.hxx"
#include "mixer/MixerControl.hxx"
#include "Idle.hxx"
extern unsigned audio_output_state_version;

2
src/output/OutputControl.cxx
View File

@ -24,7 +24,7 @@
#include "OutputInternal.hxx"
#include "OutputPlugin.hxx"
#include "OutputError.hxx"
#include "MixerControl.hxx"
#include "mixer/MixerControl.hxx"
#include "notify.hxx"
#include "filter/plugins/ReplayGainFilterPlugin.hxx"
#include "util/Error.hxx"

2
src/output/OutputFinish.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "OutputInternal.hxx"
#include "OutputPlugin.hxx"
#include "MixerControl.hxx"
#include "mixer/MixerControl.hxx"
#include "filter/FilterInternal.hxx"
#include <assert.h>

8
src/output/OutputInit.cxx
View File

@ -24,10 +24,10 @@
#include "OutputAPI.hxx"
#include "filter/FilterConfig.hxx"
#include "AudioParser.hxx"
#include "MixerList.hxx"
#include "MixerType.hxx"
#include "MixerControl.hxx"
#include "mixer/SoftwareMixerPlugin.hxx"
#include "mixer/MixerList.hxx"
#include "mixer/MixerType.hxx"
#include "mixer/MixerControl.hxx"
#include "mixer/plugins/SoftwareMixerPlugin.hxx"
#include "filter/FilterPlugin.hxx"
#include "filter/FilterRegistry.hxx"
#include "filter/plugins/AutoConvertFilterPlugin.hxx"

2
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "AlsaOutputPlugin.hxx"
#include "../OutputAPI.hxx"
#include "MixerList.hxx"
#include "mixer/MixerList.hxx"
#include "pcm/PcmExport.hxx"
#include "util/Manual.hxx"
#include "util/Error.hxx"

2
src/output/plugins/OssOutputPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "OssOutputPlugin.hxx"
#include "../OutputAPI.hxx"
#include "MixerList.hxx"
#include "mixer/MixerList.hxx"
#include "system/fd_util.h"
#include "util/Error.hxx"
#include "util/Domain.hxx"

4
src/output/plugins/PulseOutputPlugin.cxx
View File

@ -20,8 +20,8 @@
#include "config.h"
#include "PulseOutputPlugin.hxx"
#include "../OutputAPI.hxx"
#include "MixerList.hxx"
#include "mixer/PulseMixerPlugin.hxx"
#include "mixer/MixerList.hxx"
#include "mixer/plugins/PulseMixerPlugin.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"

2
src/output/plugins/RoarOutputPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "config.h"
#include "RoarOutputPlugin.hxx"
#include "../OutputAPI.hxx"
#include "MixerList.hxx"
#include "mixer/MixerList.hxx"
#include "thread/Mutex.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"

2
src/output/plugins/WinmmOutputPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "WinmmOutputPlugin.hxx"
#include "../OutputAPI.hxx"
#include "pcm/PcmBuffer.hxx"
#include "MixerList.hxx"
#include "mixer/MixerList.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "util/Macros.hxx"

4
test/read_mixer.cxx
View File

@ -18,8 +18,8 @@
*/
#include "config.h"
#include "MixerControl.hxx"
#include "MixerList.hxx"
#include "mixer/MixerControl.hxx"
#include "mixer/MixerList.hxx"
#include "filter/FilterRegistry.hxx"
#include "pcm/Volume.hxx"
#include "GlobalEvents.hxx"

2
test/run_filter.cxx
View File

@ -26,7 +26,7 @@
#include "filter/FilterPlugin.hxx"
#include "filter/FilterInternal.hxx"
#include "pcm/Volume.hxx"
#include "MixerControl.hxx"
#include "mixer/MixerControl.hxx"
#include "stdbin.h"
#include "util/Error.hxx"
#include "system/FatalError.hxx"