diff options
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | src/output/Registry.cxx | 2 | ||||
| -rw-r--r-- | src/output/plugins/httpd/HttpdClient.cxx (renamed from src/output/plugins/HttpdClient.cxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/httpd/HttpdClient.hxx (renamed from src/output/plugins/HttpdClient.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/httpd/HttpdInternal.hxx (renamed from src/output/plugins/HttpdInternal.hxx) | 4 | ||||
| -rw-r--r-- | src/output/plugins/httpd/HttpdOutputPlugin.cxx (renamed from src/output/plugins/HttpdOutputPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/output/plugins/httpd/HttpdOutputPlugin.hxx (renamed from src/output/plugins/HttpdOutputPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/httpd/IcyMetaDataServer.cxx (renamed from src/IcyMetaDataServer.cxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/httpd/IcyMetaDataServer.hxx (renamed from src/IcyMetaDataServer.hxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/httpd/Page.cxx (renamed from src/Page.cxx) | 0 | ||||
| -rw-r--r-- | src/output/plugins/httpd/Page.hxx (renamed from src/Page.hxx) | 0 |
11 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 869736ff9..b75fbf69a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,7 +131,6 @@ src_mpd_SOURCES = \ src/MusicPipe.cxx src/MusicPipe.hxx \ src/MusicChunk.cxx src/MusicChunk.hxx \ src/Mapper.cxx src/Mapper.hxx \ - src/Page.cxx src/Page.hxx \ src/Partition.cxx src/Partition.hxx \ src/Permission.cxx src/Permission.hxx \ src/PlayerThread.cxx src/PlayerThread.hxx \ @@ -1130,12 +1129,14 @@ endif if ENABLE_HTTPD_OUTPUT liboutput_plugins_a_SOURCES += \ - src/IcyMetaDataServer.cxx src/IcyMetaDataServer.hxx \ - src/output/plugins/HttpdInternal.hxx \ - src/output/plugins/HttpdClient.cxx \ - src/output/plugins/HttpdClient.hxx \ - src/output/plugins/HttpdOutputPlugin.cxx \ - src/output/plugins/HttpdOutputPlugin.hxx + src/output/plugins/httpd/IcyMetaDataServer.cxx \ + src/output/plugins/httpd/IcyMetaDataServer.hxx \ + src/output/plugins/httpd/Page.cxx src/output/plugins/httpd/Page.hxx \ + src/output/plugins/httpd/HttpdInternal.hxx \ + src/output/plugins/httpd/HttpdClient.cxx \ + src/output/plugins/httpd/HttpdClient.hxx \ + src/output/plugins/httpd/HttpdOutputPlugin.cxx \ + src/output/plugins/httpd/HttpdOutputPlugin.hxx endif if ENABLE_SOLARIS_OUTPUT @@ -1659,7 +1660,6 @@ test_run_output_SOURCES = test/run_output.cxx \ src/CheckAudioFormat.cxx \ src/AudioFormat.cxx \ src/AudioParser.cxx \ - src/Page.cxx \ src/output/Domain.cxx \ src/output/Init.cxx src/output/Finish.cxx src/output/Registry.cxx \ src/output/OutputPlugin.cxx \ diff --git a/src/output/Registry.cxx b/src/output/Registry.cxx index 6ce96fe57..42da59d15 100644 --- a/src/output/Registry.cxx +++ b/src/output/Registry.cxx @@ -23,7 +23,7 @@ #include "plugins/AlsaOutputPlugin.hxx" #include "plugins/AoOutputPlugin.hxx" #include "plugins/FifoOutputPlugin.hxx" -#include "plugins/HttpdOutputPlugin.hxx" +#include "plugins/httpd/HttpdOutputPlugin.hxx" #include "plugins/JackOutputPlugin.hxx" #include "plugins/NullOutputPlugin.hxx" #include "plugins/OpenALOutputPlugin.hxx" diff --git a/src/output/plugins/HttpdClient.cxx b/src/output/plugins/httpd/HttpdClient.cxx index d761bdf57..d761bdf57 100644 --- a/src/output/plugins/HttpdClient.cxx +++ b/src/output/plugins/httpd/HttpdClient.cxx diff --git a/src/output/plugins/HttpdClient.hxx b/src/output/plugins/httpd/HttpdClient.hxx index f94f05769..f94f05769 100644 --- a/src/output/plugins/HttpdClient.hxx +++ b/src/output/plugins/httpd/HttpdClient.hxx diff --git a/src/output/plugins/HttpdInternal.hxx b/src/output/plugins/httpd/HttpdInternal.hxx index 53029edc6..a16c60bc3 100644 --- a/src/output/plugins/HttpdInternal.hxx +++ b/src/output/plugins/httpd/HttpdInternal.hxx @@ -25,8 +25,8 @@ #ifndef MPD_OUTPUT_HTTPD_INTERNAL_H #define MPD_OUTPUT_HTTPD_INTERNAL_H -#include "../Internal.hxx" -#include "../Timer.hxx" +#include "output/Internal.hxx" +#include "output/Timer.hxx" #include "thread/Mutex.hxx" #include "event/ServerSocket.hxx" #include "event/DeferredMonitor.hxx" diff --git a/src/output/plugins/HttpdOutputPlugin.cxx b/src/output/plugins/httpd/HttpdOutputPlugin.cxx index 17a3df59a..e3ba7727d 100644 --- a/src/output/plugins/HttpdOutputPlugin.cxx +++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "HttpdOutputPlugin.hxx" #include "HttpdInternal.hxx" #include "HttpdClient.hxx" -#include "../OutputAPI.hxx" +#include "output/OutputAPI.hxx" #include "encoder/EncoderPlugin.hxx" #include "encoder/EncoderList.hxx" #include "system/Resolver.hxx" diff --git a/src/output/plugins/HttpdOutputPlugin.hxx b/src/output/plugins/httpd/HttpdOutputPlugin.hxx index df99e2b43..df99e2b43 100644 --- a/src/output/plugins/HttpdOutputPlugin.hxx +++ b/src/output/plugins/httpd/HttpdOutputPlugin.hxx diff --git a/src/IcyMetaDataServer.cxx b/src/output/plugins/httpd/IcyMetaDataServer.cxx index 146df23d1..146df23d1 100644 --- a/src/IcyMetaDataServer.cxx +++ b/src/output/plugins/httpd/IcyMetaDataServer.cxx diff --git a/src/IcyMetaDataServer.hxx b/src/output/plugins/httpd/IcyMetaDataServer.hxx index 773b46641..773b46641 100644 --- a/src/IcyMetaDataServer.hxx +++ b/src/output/plugins/httpd/IcyMetaDataServer.hxx diff --git a/src/Page.cxx b/src/output/plugins/httpd/Page.cxx index e22134bbc..e22134bbc 100644 --- a/src/Page.cxx +++ b/src/output/plugins/httpd/Page.cxx diff --git a/src/Page.hxx b/src/output/plugins/httpd/Page.hxx index 95f35d06a..95f35d06a 100644 --- a/src/Page.hxx +++ b/src/output/plugins/httpd/Page.hxx |