From 68b79f97f331588f29fbf956d53a2e99f70e8b7f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 28 Jan 2014 11:42:54 +0100 Subject: [PATCH] output: rename source files --- Makefile.am | 14 +++++++------- src/CommandLine.cxx | 2 +- src/mixer/MixerAll.cxx | 2 +- src/output/{OutputError.cxx => Domain.cxx} | 2 +- src/output/{OutputError.hxx => Domain.hxx} | 0 src/output/{OutputFinish.cxx => Finish.cxx} | 2 +- src/output/{OutputInit.cxx => Init.cxx} | 6 +++--- src/output/{OutputInternal.hxx => Internal.hxx} | 0 src/output/MultipleOutputs.cxx | 4 ++-- src/output/OutputAPI.hxx | 2 +- src/output/OutputCommand.cxx | 2 +- src/output/OutputControl.cxx | 4 ++-- src/output/OutputPlugin.cxx | 2 +- src/output/OutputPrint.cxx | 2 +- src/output/OutputState.cxx | 4 ++-- src/output/OutputThread.cxx | 4 ++-- src/output/{OutputList.cxx => Registry.cxx} | 2 +- src/output/{OutputList.hxx => Registry.hxx} | 0 src/output/plugins/HttpdInternal.hxx | 2 +- test/run_output.cxx | 2 +- 20 files changed, 29 insertions(+), 29 deletions(-) rename src/output/{OutputError.cxx => Domain.cxx} (97%) rename src/output/{OutputError.hxx => Domain.hxx} (100%) rename src/output/{OutputFinish.cxx => Finish.cxx} (97%) rename src/output/{OutputInit.cxx => Init.cxx} (99%) rename src/output/{OutputInternal.hxx => Internal.hxx} (100%) rename src/output/{OutputList.cxx => Registry.cxx} (98%) rename src/output/{OutputList.hxx => Registry.hxx} (100%) diff --git a/Makefile.am b/Makefile.am index 536bf4105..d50a17264 100644 --- a/Makefile.am +++ b/Makefile.am @@ -960,18 +960,18 @@ OUTPUT_LIBS = \ OUTPUT_API_SRC = \ src/output/OutputAPI.hxx \ - src/output/OutputInternal.hxx \ - src/output/OutputList.cxx src/output/OutputList.hxx \ + src/output/Internal.hxx \ + src/output/Registry.cxx src/output/Registry.hxx \ src/output/MultipleOutputs.cxx src/output/MultipleOutputs.hxx \ src/output/OutputThread.cxx src/output/OutputThread.hxx \ - src/output/OutputError.cxx src/output/OutputError.hxx \ + src/output/Domain.cxx src/output/Domain.hxx \ src/output/OutputControl.cxx src/output/OutputControl.hxx \ src/output/OutputState.cxx src/output/OutputState.hxx \ src/output/OutputPrint.cxx src/output/OutputPrint.hxx \ src/output/OutputCommand.cxx src/output/OutputCommand.hxx \ src/output/OutputPlugin.cxx src/output/OutputPlugin.hxx \ - src/output/OutputFinish.cxx \ - src/output/OutputInit.cxx + src/output/Finish.cxx \ + src/output/Init.cxx liboutput_plugins_a_SOURCES = \ src/output/plugins/NullOutputPlugin.cxx \ @@ -1590,8 +1590,8 @@ test_run_output_SOURCES = test/run_output.cxx \ src/AudioParser.cxx \ src/Timer.cxx \ src/Page.cxx \ - src/output/OutputError.cxx \ - src/output/OutputInit.cxx src/output/OutputFinish.cxx src/output/OutputList.cxx \ + src/output/Domain.cxx \ + src/output/Init.cxx src/output/Finish.cxx src/output/Registry.cxx \ src/output/OutputPlugin.cxx \ src/mixer/MixerControl.cxx \ src/mixer/MixerType.cxx \ diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 19bc9d4bb..5500d43ba 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -27,7 +27,7 @@ #include "db/DatabasePlugin.hxx" #include "decoder/DecoderList.hxx" #include "decoder/DecoderPlugin.hxx" -#include "output/OutputList.hxx" +#include "output/Registry.hxx" #include "output/OutputPlugin.hxx" #include "input/Registry.hxx" #include "input/InputPlugin.hxx" diff --git a/src/mixer/MixerAll.cxx b/src/mixer/MixerAll.cxx index c2fa903f2..ac40bc496 100644 --- a/src/mixer/MixerAll.cxx +++ b/src/mixer/MixerAll.cxx @@ -22,7 +22,7 @@ #include "MixerControl.hxx" #include "MixerInternal.hxx" #include "MixerList.hxx" -#include "output/OutputInternal.hxx" +#include "output/Internal.hxx" #include "pcm/Volume.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/output/OutputError.cxx b/src/output/Domain.cxx similarity index 97% rename from src/output/OutputError.cxx rename to src/output/Domain.cxx index 9d4128912..878e5f3c5 100644 --- a/src/output/OutputError.cxx +++ b/src/output/Domain.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "OutputError.hxx" +#include "Domain.hxx" #include "util/Domain.hxx" const Domain output_domain("output"); diff --git a/src/output/OutputError.hxx b/src/output/Domain.hxx similarity index 100% rename from src/output/OutputError.hxx rename to src/output/Domain.hxx diff --git a/src/output/OutputFinish.cxx b/src/output/Finish.cxx similarity index 97% rename from src/output/OutputFinish.cxx rename to src/output/Finish.cxx index 1f405aaf9..b3f94fe31 100644 --- a/src/output/OutputFinish.cxx +++ b/src/output/Finish.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "OutputInternal.hxx" +#include "Internal.hxx" #include "OutputPlugin.hxx" #include "mixer/MixerControl.hxx" #include "filter/FilterInternal.hxx" diff --git a/src/output/OutputInit.cxx b/src/output/Init.cxx similarity index 99% rename from src/output/OutputInit.cxx rename to src/output/Init.cxx index f91e5b5e3..29c7137d9 100644 --- a/src/output/OutputInit.cxx +++ b/src/output/Init.cxx @@ -18,9 +18,9 @@ */ #include "config.h" -#include "OutputInternal.hxx" -#include "OutputList.hxx" -#include "OutputError.hxx" +#include "Internal.hxx" +#include "Registry.hxx" +#include "Domain.hxx" #include "OutputAPI.hxx" #include "filter/FilterConfig.hxx" #include "AudioParser.hxx" diff --git a/src/output/OutputInternal.hxx b/src/output/Internal.hxx similarity index 100% rename from src/output/OutputInternal.hxx rename to src/output/Internal.hxx diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx index 7df89cc55..c83d8f02d 100644 --- a/src/output/MultipleOutputs.cxx +++ b/src/output/MultipleOutputs.cxx @@ -20,9 +20,9 @@ #include "config.h" #include "MultipleOutputs.hxx" #include "PlayerControl.hxx" -#include "OutputInternal.hxx" +#include "Internal.hxx" #include "OutputControl.hxx" -#include "OutputError.hxx" +#include "Domain.hxx" #include "MusicBuffer.hxx" #include "MusicPipe.hxx" #include "MusicChunk.hxx" diff --git a/src/output/OutputAPI.hxx b/src/output/OutputAPI.hxx index cfbc43196..e0fd6eec8 100644 --- a/src/output/OutputAPI.hxx +++ b/src/output/OutputAPI.hxx @@ -23,7 +23,7 @@ // IWYU pragma: begin_exports #include "OutputPlugin.hxx" -#include "OutputInternal.hxx" +#include "Internal.hxx" #include "AudioFormat.hxx" #include "tag/Tag.hxx" #include "config/ConfigData.hxx" diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx index 6d5690575..6afb70cf1 100644 --- a/src/output/OutputCommand.cxx +++ b/src/output/OutputCommand.cxx @@ -27,7 +27,7 @@ #include "config.h" #include "OutputCommand.hxx" #include "MultipleOutputs.hxx" -#include "OutputInternal.hxx" +#include "Internal.hxx" #include "PlayerControl.hxx" #include "mixer/MixerControl.hxx" #include "Idle.hxx" diff --git a/src/output/OutputControl.cxx b/src/output/OutputControl.cxx index f6844911f..5b4c4f487 100644 --- a/src/output/OutputControl.cxx +++ b/src/output/OutputControl.cxx @@ -21,9 +21,9 @@ #include "config.h" #include "OutputControl.hxx" #include "OutputThread.hxx" -#include "OutputInternal.hxx" +#include "Internal.hxx" #include "OutputPlugin.hxx" -#include "OutputError.hxx" +#include "Domain.hxx" #include "mixer/MixerControl.hxx" #include "notify.hxx" #include "filter/plugins/ReplayGainFilterPlugin.hxx" diff --git a/src/output/OutputPlugin.cxx b/src/output/OutputPlugin.cxx index 1c8d3bb48..45b979d3c 100644 --- a/src/output/OutputPlugin.cxx +++ b/src/output/OutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "OutputPlugin.hxx" -#include "OutputInternal.hxx" +#include "Internal.hxx" AudioOutput * ao_plugin_init(const AudioOutputPlugin *plugin, diff --git a/src/output/OutputPrint.cxx b/src/output/OutputPrint.cxx index b9fb79607..414a86e32 100644 --- a/src/output/OutputPrint.cxx +++ b/src/output/OutputPrint.cxx @@ -25,7 +25,7 @@ #include "config.h" #include "OutputPrint.hxx" #include "MultipleOutputs.hxx" -#include "OutputInternal.hxx" +#include "Internal.hxx" #include "client/Client.hxx" void diff --git a/src/output/OutputState.cxx b/src/output/OutputState.cxx index f717e3cbb..7f3a8da7b 100644 --- a/src/output/OutputState.cxx +++ b/src/output/OutputState.cxx @@ -25,8 +25,8 @@ #include "config.h" #include "OutputState.hxx" #include "MultipleOutputs.hxx" -#include "OutputInternal.hxx" -#include "OutputError.hxx" +#include "Internal.hxx" +#include "Domain.hxx" #include "Log.hxx" #include "util/StringUtil.hxx" diff --git a/src/output/OutputThread.cxx b/src/output/OutputThread.cxx index f2ea048df..449198c8b 100644 --- a/src/output/OutputThread.cxx +++ b/src/output/OutputThread.cxx @@ -19,9 +19,9 @@ #include "config.h" #include "OutputThread.hxx" -#include "OutputInternal.hxx" +#include "Internal.hxx" #include "OutputAPI.hxx" -#include "OutputError.hxx" +#include "Domain.hxx" #include "pcm/PcmMix.hxx" #include "notify.hxx" #include "filter/FilterInternal.hxx" diff --git a/src/output/OutputList.cxx b/src/output/Registry.cxx similarity index 98% rename from src/output/OutputList.cxx rename to src/output/Registry.cxx index c523d4cbc..6ce96fe57 100644 --- a/src/output/OutputList.cxx +++ b/src/output/Registry.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "OutputList.hxx" +#include "Registry.hxx" #include "OutputAPI.hxx" #include "plugins/AlsaOutputPlugin.hxx" #include "plugins/AoOutputPlugin.hxx" diff --git a/src/output/OutputList.hxx b/src/output/Registry.hxx similarity index 100% rename from src/output/OutputList.hxx rename to src/output/Registry.hxx diff --git a/src/output/plugins/HttpdInternal.hxx b/src/output/plugins/HttpdInternal.hxx index 1d48c3ad5..ad728949f 100644 --- a/src/output/plugins/HttpdInternal.hxx +++ b/src/output/plugins/HttpdInternal.hxx @@ -25,7 +25,7 @@ #ifndef MPD_OUTPUT_HTTPD_INTERNAL_H #define MPD_OUTPUT_HTTPD_INTERNAL_H -#include "../OutputInternal.hxx" +#include "../Internal.hxx" #include "Timer.hxx" #include "thread/Mutex.hxx" #include "event/ServerSocket.hxx" diff --git a/test/run_output.cxx b/test/run_output.cxx index 04f9b9d63..2664b7150 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "output/OutputControl.hxx" -#include "output/OutputInternal.hxx" +#include "output/Internal.hxx" #include "output/OutputPlugin.hxx" #include "config/ConfigData.hxx" #include "config/ConfigGlobal.hxx"