diff --git a/Makefile.am b/Makefile.am index 9d27172c8..b6fa7de37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1373,7 +1373,7 @@ OUTPUT_LIBS = \ OUTPUT_API_SRC = \ src/output/Client.hxx \ src/output/OutputAPI.hxx \ - src/output/Internal.cxx src/output/Internal.hxx \ + src/output/Filtered.cxx src/output/Filtered.hxx \ src/output/Wrapper.hxx \ src/output/Registry.cxx src/output/Registry.hxx \ src/output/MultipleOutputs.cxx src/output/MultipleOutputs.hxx \ diff --git a/src/mixer/MixerAll.cxx b/src/mixer/MixerAll.cxx index ddccbcd80..822ffc736 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/Internal.hxx" +#include "output/Filtered.hxx" #include "pcm/Volume.hxx" #include "Log.hxx" diff --git a/src/output/Control.cxx b/src/output/Control.cxx index c15d22467..c42a1cb0a 100644 --- a/src/output/Control.cxx +++ b/src/output/Control.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "Control.hxx" -#include "Internal.hxx" +#include "Filtered.hxx" #include "OutputPlugin.hxx" #include "Domain.hxx" #include "mixer/MixerControl.hxx" diff --git a/src/output/Internal.cxx b/src/output/Filtered.cxx similarity index 99% rename from src/output/Internal.cxx rename to src/output/Filtered.cxx index 5af69348e..db74a3ab5 100644 --- a/src/output/Internal.cxx +++ b/src/output/Filtered.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "Internal.hxx" +#include "Filtered.hxx" #include "OutputPlugin.hxx" #include "Domain.hxx" #include "Log.hxx" diff --git a/src/output/Internal.hxx b/src/output/Filtered.hxx similarity index 98% rename from src/output/Internal.hxx rename to src/output/Filtered.hxx index 3e374d733..2fb31ed49 100644 --- a/src/output/Internal.hxx +++ b/src/output/Filtered.hxx @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_OUTPUT_INTERNAL_HXX -#define MPD_OUTPUT_INTERNAL_HXX +#ifndef MPD_FILTERED_AUDIO_OUTPUT_HXX +#define MPD_FILTERED_AUDIO_OUTPUT_HXX #include "AudioFormat.hxx" #include "filter/Observer.hxx" diff --git a/src/output/Finish.cxx b/src/output/Finish.cxx index c8d372fa0..b5729fd29 100644 --- a/src/output/Finish.cxx +++ b/src/output/Finish.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "Internal.hxx" +#include "Filtered.hxx" #include "OutputPlugin.hxx" #include "mixer/MixerControl.hxx" #include "filter/FilterInternal.hxx" diff --git a/src/output/Init.cxx b/src/output/Init.cxx index 159c1d63b..775e90184 100644 --- a/src/output/Init.cxx +++ b/src/output/Init.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "Internal.hxx" +#include "Filtered.hxx" #include "Registry.hxx" #include "Domain.hxx" #include "OutputAPI.hxx" diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx index 13dd62809..4d6af2543 100644 --- a/src/output/MultipleOutputs.cxx +++ b/src/output/MultipleOutputs.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "MultipleOutputs.hxx" -#include "Internal.hxx" +#include "Filtered.hxx" #include "Domain.hxx" #include "MusicBuffer.hxx" #include "MusicPipe.hxx" diff --git a/src/output/OutputAPI.hxx b/src/output/OutputAPI.hxx index cbd064ba3..beef09d08 100644 --- a/src/output/OutputAPI.hxx +++ b/src/output/OutputAPI.hxx @@ -23,7 +23,7 @@ // IWYU pragma: begin_exports #include "OutputPlugin.hxx" -#include "Internal.hxx" +#include "Filtered.hxx" #include "AudioFormat.hxx" #include "tag/Tag.hxx" #include "config/Block.hxx" diff --git a/src/output/OutputCommand.cxx b/src/output/OutputCommand.cxx index 1da8e5fdf..ddfd1f572 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 "Internal.hxx" +#include "Filtered.hxx" #include "Client.hxx" #include "player/Control.hxx" #include "mixer/MixerControl.hxx" diff --git a/src/output/OutputPlugin.cxx b/src/output/OutputPlugin.cxx index 882553513..f69c52d23 100644 --- a/src/output/OutputPlugin.cxx +++ b/src/output/OutputPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "OutputPlugin.hxx" -#include "Internal.hxx" +#include "Filtered.hxx" FilteredAudioOutput * ao_plugin_init(EventLoop &event_loop, diff --git a/src/output/Print.cxx b/src/output/Print.cxx index 01aa6a37a..9b8e183d3 100644 --- a/src/output/Print.cxx +++ b/src/output/Print.cxx @@ -25,7 +25,7 @@ #include "config.h" #include "Print.hxx" #include "MultipleOutputs.hxx" -#include "Internal.hxx" +#include "Filtered.hxx" #include "client/Response.hxx" void diff --git a/src/output/State.cxx b/src/output/State.cxx index dd84901d7..e6447e303 100644 --- a/src/output/State.cxx +++ b/src/output/State.cxx @@ -25,7 +25,7 @@ #include "config.h" #include "State.hxx" #include "MultipleOutputs.hxx" -#include "Internal.hxx" +#include "Filtered.hxx" #include "Domain.hxx" #include "Log.hxx" #include "fs/io/BufferedOutputStream.hxx" diff --git a/src/output/Thread.cxx b/src/output/Thread.cxx index a92a7f0fc..b3a6c567f 100644 --- a/src/output/Thread.cxx +++ b/src/output/Thread.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "Control.hxx" -#include "Internal.hxx" +#include "Filtered.hxx" #include "Client.hxx" #include "OutputPlugin.hxx" #include "Domain.hxx" diff --git a/src/output/Wrapper.hxx b/src/output/Wrapper.hxx index f5a09afe7..96882ad81 100644 --- a/src/output/Wrapper.hxx +++ b/src/output/Wrapper.hxx @@ -20,7 +20,7 @@ #ifndef MPD_OUTPUT_WRAPPER_HXX #define MPD_OUTPUT_WRAPPER_HXX -#include "Internal.hxx" +#include "Filtered.hxx" #include "util/Cast.hxx" #include diff --git a/src/output/plugins/httpd/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx index 7726ea2c1..7ad0a1325 100644 --- a/src/output/plugins/httpd/HttpdInternal.hxx +++ b/src/output/plugins/httpd/HttpdInternal.hxx @@ -27,7 +27,7 @@ #include "HttpdClient.hxx" #include "output/Wrapper.hxx" -#include "output/Internal.hxx" +#include "output/Filtered.hxx" #include "output/Timer.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" diff --git a/test/run_output.cxx b/test/run_output.cxx index f3e969fd8..a374c4007 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "output/Internal.hxx" +#include "output/Filtered.hxx" #include "output/OutputPlugin.hxx" #include "config/Param.hxx" #include "config/ConfigGlobal.hxx"