diff options
| -rw-r--r-- | Makefile.am | 39 | ||||
| -rw-r--r-- | src/CommandLine.cxx | 4 | ||||
| -rw-r--r-- | src/encoder/EncoderAPI.hxx (renamed from src/EncoderAPI.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/EncoderList.cxx (renamed from src/EncoderList.cxx) | 16 | ||||
| -rw-r--r-- | src/encoder/EncoderList.hxx (renamed from src/EncoderList.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/EncoderPlugin.hxx (renamed from src/EncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/FlacEncoderPlugin.cxx (renamed from src/encoder/FlacEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/FlacEncoderPlugin.hxx (renamed from src/encoder/FlacEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/LameEncoderPlugin.cxx (renamed from src/encoder/LameEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/LameEncoderPlugin.hxx (renamed from src/encoder/LameEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/NullEncoderPlugin.cxx (renamed from src/encoder/NullEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/NullEncoderPlugin.hxx (renamed from src/encoder/NullEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/OggSerial.cxx (renamed from src/encoder/OggSerial.cxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/OggSerial.hxx (renamed from src/encoder/OggSerial.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/OggStream.hxx (renamed from src/encoder/OggStream.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/OpusEncoderPlugin.cxx (renamed from src/encoder/OpusEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/OpusEncoderPlugin.hxx (renamed from src/encoder/OpusEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/ShineEncoderPlugin.cxx (renamed from src/encoder/ShineEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/ShineEncoderPlugin.hxx (renamed from src/encoder/ShineEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/TwolameEncoderPlugin.cxx (renamed from src/encoder/TwolameEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/TwolameEncoderPlugin.hxx (renamed from src/encoder/TwolameEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/VorbisEncoderPlugin.cxx (renamed from src/encoder/VorbisEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/VorbisEncoderPlugin.hxx (renamed from src/encoder/VorbisEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/encoder/plugins/WaveEncoderPlugin.cxx (renamed from src/encoder/WaveEncoderPlugin.cxx) | 2 | ||||
| -rw-r--r-- | src/encoder/plugins/WaveEncoderPlugin.hxx (renamed from src/encoder/WaveEncoderPlugin.hxx) | 0 | ||||
| -rw-r--r-- | src/output/HttpdOutputPlugin.cxx | 4 | ||||
| -rw-r--r-- | src/output/RecorderOutputPlugin.cxx | 4 | ||||
| -rw-r--r-- | src/output/ShoutOutputPlugin.cxx | 4 | ||||
| -rw-r--r-- | test/run_encoder.cxx | 4 | ||||
| -rw-r--r-- | test/test_vorbis_encoder.cxx | 4 |
30 files changed, 49 insertions, 46 deletions
diff --git a/Makefile.am b/Makefile.am index 42e39210f..94a8fb3e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -745,55 +745,58 @@ ENCODER_LIBS = \ libencoder_plugins_a_SOURCES = \ src/EncoderAPI.hxx \ src/EncoderPlugin.hxx \ - src/encoder/OggStream.hxx \ - src/encoder/NullEncoderPlugin.cxx src/encoder/NullEncoderPlugin.hxx \ - src/EncoderList.cxx src/EncoderList.hxx + src/encoder/plugins/OggStream.hxx \ + src/encoder/plugins/NullEncoderPlugin.cxx \ + src/encoder/plugins/NullEncoderPlugin.hxx \ + src/encoder/EncoderList.cxx src/encoder/EncoderList.hxx if HAVE_OGG_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/OggSerial.cxx src/encoder/OggSerial.hxx \ - src/encoder/OggStream.hxx + src/encoder/plugins/OggSerial.cxx \ + src/encoder/plugins/OggSerial.hxx \ + src/encoder/plugins/OggStream.hxx endif if ENABLE_WAVE_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/WaveEncoderPlugin.cxx \ - src/encoder/WaveEncoderPlugin.hxx + src/encoder/plugins/WaveEncoderPlugin.cxx \ + src/encoder/plugins/WaveEncoderPlugin.hxx endif if ENABLE_VORBIS_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/VorbisEncoderPlugin.cxx \ - src/encoder/VorbisEncoderPlugin.hxx + src/encoder/plugins/VorbisEncoderPlugin.cxx \ + src/encoder/plugins/VorbisEncoderPlugin.hxx endif if HAVE_OPUS libencoder_plugins_a_SOURCES += \ - src/encoder/OpusEncoderPlugin.cxx \ - src/encoder/OpusEncoderPlugin.hxx + src/encoder/plugins/OpusEncoderPlugin.cxx \ + src/encoder/plugins/OpusEncoderPlugin.hxx endif if ENABLE_LAME_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/LameEncoderPlugin.cxx \ - src/encoder/LameEncoderPlugin.hxx + src/encoder/plugins/LameEncoderPlugin.cxx \ + src/encoder/plugins/LameEncoderPlugin.hxx endif if ENABLE_TWOLAME_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/TwolameEncoderPlugin.cxx \ - src/encoder/TwolameEncoderPlugin.hxx + src/encoder/plugins/TwolameEncoderPlugin.cxx \ + src/encoder/plugins/TwolameEncoderPlugin.hxx endif if ENABLE_FLAC_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/FlacEncoderPlugin.cxx src/encoder/FlacEncoderPlugin.hxx + src/encoder/plugins/FlacEncoderPlugin.cxx \ + src/encoder/plugins/FlacEncoderPlugin.hxx endif if ENABLE_SHINE_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/ShineEncoderPlugin.cxx \ - src/encoder/ShineEncoderPlugin.hxx + src/encoder/plugins/ShineEncoderPlugin.cxx \ + src/encoder/plugins/ShineEncoderPlugin.hxx endif else diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 33f4917c0..9430d0df8 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -43,8 +43,8 @@ #include "util/OptionParser.hxx" #ifdef ENABLE_ENCODER -#include "EncoderList.hxx" -#include "EncoderPlugin.hxx" +#include "encoder/EncoderList.hxx" +#include "encoder/EncoderPlugin.hxx" #endif #ifdef ENABLE_ARCHIVE diff --git a/src/EncoderAPI.hxx b/src/encoder/EncoderAPI.hxx index 267affa3a..267affa3a 100644 --- a/src/EncoderAPI.hxx +++ b/src/encoder/EncoderAPI.hxx diff --git a/src/EncoderList.cxx b/src/encoder/EncoderList.cxx index baf1bcac2..4bca5a4fe 100644 --- a/src/EncoderList.cxx +++ b/src/encoder/EncoderList.cxx @@ -20,14 +20,14 @@ #include "config.h" #include "EncoderList.hxx" #include "EncoderPlugin.hxx" -#include "encoder/NullEncoderPlugin.hxx" -#include "encoder/WaveEncoderPlugin.hxx" -#include "encoder/VorbisEncoderPlugin.hxx" -#include "encoder/OpusEncoderPlugin.hxx" -#include "encoder/FlacEncoderPlugin.hxx" -#include "encoder/ShineEncoderPlugin.hxx" -#include "encoder/LameEncoderPlugin.hxx" -#include "encoder/TwolameEncoderPlugin.hxx" +#include "plugins/NullEncoderPlugin.hxx" +#include "plugins/WaveEncoderPlugin.hxx" +#include "plugins/VorbisEncoderPlugin.hxx" +#include "plugins/OpusEncoderPlugin.hxx" +#include "plugins/FlacEncoderPlugin.hxx" +#include "plugins/ShineEncoderPlugin.hxx" +#include "plugins/LameEncoderPlugin.hxx" +#include "plugins/TwolameEncoderPlugin.hxx" #include <string.h> diff --git a/src/EncoderList.hxx b/src/encoder/EncoderList.hxx index e18d8ec74..e18d8ec74 100644 --- a/src/EncoderList.hxx +++ b/src/encoder/EncoderList.hxx diff --git a/src/EncoderPlugin.hxx b/src/encoder/EncoderPlugin.hxx index 95e4e5838..95e4e5838 100644 --- a/src/EncoderPlugin.hxx +++ b/src/encoder/EncoderPlugin.hxx diff --git a/src/encoder/FlacEncoderPlugin.cxx b/src/encoder/plugins/FlacEncoderPlugin.cxx index 83ceea699..ebdd101f3 100644 --- a/src/encoder/FlacEncoderPlugin.cxx +++ b/src/encoder/plugins/FlacEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "FlacEncoderPlugin.hxx" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "AudioFormat.hxx" #include "pcm/PcmBuffer.hxx" #include "ConfigError.hxx" diff --git a/src/encoder/FlacEncoderPlugin.hxx b/src/encoder/plugins/FlacEncoderPlugin.hxx index 0cdc01600..0cdc01600 100644 --- a/src/encoder/FlacEncoderPlugin.hxx +++ b/src/encoder/plugins/FlacEncoderPlugin.hxx diff --git a/src/encoder/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx index 1f4ab2088..484c4d0fe 100644 --- a/src/encoder/LameEncoderPlugin.cxx +++ b/src/encoder/plugins/LameEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "LameEncoderPlugin.hxx" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "AudioFormat.hxx" #include "ConfigError.hxx" #include "util/NumberParser.hxx" diff --git a/src/encoder/LameEncoderPlugin.hxx b/src/encoder/plugins/LameEncoderPlugin.hxx index 03e398f67..03e398f67 100644 --- a/src/encoder/LameEncoderPlugin.hxx +++ b/src/encoder/plugins/LameEncoderPlugin.hxx diff --git a/src/encoder/NullEncoderPlugin.cxx b/src/encoder/plugins/NullEncoderPlugin.cxx index 7ec351b71..1d571d465 100644 --- a/src/encoder/NullEncoderPlugin.cxx +++ b/src/encoder/plugins/NullEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "NullEncoderPlugin.hxx" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "util/Manual.hxx" #include "util/DynamicFifoBuffer.hxx" #include "Compiler.h" diff --git a/src/encoder/NullEncoderPlugin.hxx b/src/encoder/plugins/NullEncoderPlugin.hxx index 6acf88e49..6acf88e49 100644 --- a/src/encoder/NullEncoderPlugin.hxx +++ b/src/encoder/plugins/NullEncoderPlugin.hxx diff --git a/src/encoder/OggSerial.cxx b/src/encoder/plugins/OggSerial.cxx index 677829439..677829439 100644 --- a/src/encoder/OggSerial.cxx +++ b/src/encoder/plugins/OggSerial.cxx diff --git a/src/encoder/OggSerial.hxx b/src/encoder/plugins/OggSerial.hxx index ceba8ebf9..ceba8ebf9 100644 --- a/src/encoder/OggSerial.hxx +++ b/src/encoder/plugins/OggSerial.hxx diff --git a/src/encoder/OggStream.hxx b/src/encoder/plugins/OggStream.hxx index 805238c1d..805238c1d 100644 --- a/src/encoder/OggStream.hxx +++ b/src/encoder/plugins/OggStream.hxx diff --git a/src/encoder/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx index 672ebf5e4..9fbdc8711 100644 --- a/src/encoder/OpusEncoderPlugin.cxx +++ b/src/encoder/plugins/OpusEncoderPlugin.cxx @@ -21,7 +21,7 @@ #include "OpusEncoderPlugin.hxx" #include "OggStream.hxx" #include "OggSerial.hxx" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "AudioFormat.hxx" #include "ConfigError.hxx" #include "util/Error.hxx" diff --git a/src/encoder/OpusEncoderPlugin.hxx b/src/encoder/plugins/OpusEncoderPlugin.hxx index 4e71694b9..4e71694b9 100644 --- a/src/encoder/OpusEncoderPlugin.hxx +++ b/src/encoder/plugins/OpusEncoderPlugin.hxx diff --git a/src/encoder/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx index 39e400a58..5b1b95a27 100644 --- a/src/encoder/ShineEncoderPlugin.cxx +++ b/src/encoder/plugins/ShineEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "ShineEncoderPlugin.hxx" #include "config.h" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "AudioFormat.hxx" #include "ConfigError.hxx" #include "util/Manual.hxx" diff --git a/src/encoder/ShineEncoderPlugin.hxx b/src/encoder/plugins/ShineEncoderPlugin.hxx index 8b1520a74..8b1520a74 100644 --- a/src/encoder/ShineEncoderPlugin.hxx +++ b/src/encoder/plugins/ShineEncoderPlugin.hxx diff --git a/src/encoder/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx index 817590365..cea72bfdd 100644 --- a/src/encoder/TwolameEncoderPlugin.cxx +++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "TwolameEncoderPlugin.hxx" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "AudioFormat.hxx" #include "ConfigError.hxx" #include "util/NumberParser.hxx" diff --git a/src/encoder/TwolameEncoderPlugin.hxx b/src/encoder/plugins/TwolameEncoderPlugin.hxx index 531dd3e90..531dd3e90 100644 --- a/src/encoder/TwolameEncoderPlugin.hxx +++ b/src/encoder/plugins/TwolameEncoderPlugin.hxx diff --git a/src/encoder/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx index d82d85c17..356d67571 100644 --- a/src/encoder/VorbisEncoderPlugin.cxx +++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx @@ -21,7 +21,7 @@ #include "VorbisEncoderPlugin.hxx" #include "OggStream.hxx" #include "OggSerial.hxx" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "tag/Tag.hxx" #include "AudioFormat.hxx" #include "ConfigError.hxx" diff --git a/src/encoder/VorbisEncoderPlugin.hxx b/src/encoder/plugins/VorbisEncoderPlugin.hxx index 80703bf88..80703bf88 100644 --- a/src/encoder/VorbisEncoderPlugin.hxx +++ b/src/encoder/plugins/VorbisEncoderPlugin.hxx diff --git a/src/encoder/WaveEncoderPlugin.cxx b/src/encoder/plugins/WaveEncoderPlugin.cxx index 732226128..97a26e821 100644 --- a/src/encoder/WaveEncoderPlugin.cxx +++ b/src/encoder/plugins/WaveEncoderPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "WaveEncoderPlugin.hxx" -#include "EncoderAPI.hxx" +#include "../EncoderAPI.hxx" #include "system/ByteOrder.hxx" #include "util/Manual.hxx" #include "util/DynamicFifoBuffer.hxx" diff --git a/src/encoder/WaveEncoderPlugin.hxx b/src/encoder/plugins/WaveEncoderPlugin.hxx index 341b98adc..341b98adc 100644 --- a/src/encoder/WaveEncoderPlugin.hxx +++ b/src/encoder/plugins/WaveEncoderPlugin.hxx diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index 388d967df..322c9a61e 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -22,8 +22,8 @@ #include "HttpdInternal.hxx" #include "HttpdClient.hxx" #include "OutputAPI.hxx" -#include "EncoderPlugin.hxx" -#include "EncoderList.hxx" +#include "encoder/EncoderPlugin.hxx" +#include "encoder/EncoderList.hxx" #include "system/Resolver.hxx" #include "Page.hxx" #include "IcyMetaDataServer.hxx" diff --git a/src/output/RecorderOutputPlugin.cxx b/src/output/RecorderOutputPlugin.cxx index b0fcba45a..cebbc2cec 100644 --- a/src/output/RecorderOutputPlugin.cxx +++ b/src/output/RecorderOutputPlugin.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "RecorderOutputPlugin.hxx" #include "OutputAPI.hxx" -#include "EncoderPlugin.hxx" -#include "EncoderList.hxx" +#include "encoder/EncoderPlugin.hxx" +#include "encoder/EncoderList.hxx" #include "ConfigError.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/output/ShoutOutputPlugin.cxx b/src/output/ShoutOutputPlugin.cxx index 75eab0cac..cccd3e0ba 100644 --- a/src/output/ShoutOutputPlugin.cxx +++ b/src/output/ShoutOutputPlugin.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "ShoutOutputPlugin.hxx" #include "OutputAPI.hxx" -#include "EncoderPlugin.hxx" -#include "EncoderList.hxx" +#include "encoder/EncoderPlugin.hxx" +#include "encoder/EncoderList.hxx" #include "ConfigError.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 3714e4f3b..ace9faf18 100644 --- a/test/run_encoder.cxx +++ b/test/run_encoder.cxx @@ -18,8 +18,8 @@ */ #include "config.h" -#include "EncoderList.hxx" -#include "EncoderPlugin.hxx" +#include "encoder/EncoderList.hxx" +#include "encoder/EncoderPlugin.hxx" #include "AudioFormat.hxx" #include "AudioParser.hxx" #include "ConfigData.hxx" diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 561cf1502..fba0040d2 100644 --- a/test/test_vorbis_encoder.cxx +++ b/test/test_vorbis_encoder.cxx @@ -18,8 +18,8 @@ */ #include "config.h" -#include "EncoderList.hxx" -#include "EncoderPlugin.hxx" +#include "encoder/EncoderList.hxx" +#include "encoder/EncoderPlugin.hxx" #include "AudioFormat.hxx" #include "ConfigData.hxx" #include "stdbin.h" |