Skip to content

M
mpd
Commit 655ad344 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Encoder*: move to src/encoder

.. and move the plugins to src/encoder/plugins/.
parent 017eecb8
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 46 deletions
Makefile.am
View file @ 655ad344
...@@ -745,55 +745,58 @@ ENCODER_LIBS = \ ...@@ -745,55 +745,58 @@ ENCODER_LIBS = \
libencoder_plugins_a_SOURCES = \ libencoder_plugins_a_SOURCES = \
src/EncoderAPI.hxx \ src/EncoderAPI.hxx \
src/EncoderPlugin.hxx \ src/EncoderPlugin.hxx \
src/encoder/OggStream.hxx \ src/encoder/plugins/OggStream.hxx \
src/encoder/NullEncoderPlugin.cxx src/encoder/NullEncoderPlugin.hxx \ src/encoder/plugins/NullEncoderPlugin.cxx \
src/EncoderList.cxx src/EncoderList.hxx src/encoder/plugins/NullEncoderPlugin.hxx \
src/encoder/EncoderList.cxx src/encoder/EncoderList.hxx
if HAVE_OGG_ENCODER if HAVE_OGG_ENCODER
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/OggSerial.cxx src/encoder/OggSerial.hxx \ src/encoder/plugins/OggSerial.cxx \
src/encoder/OggStream.hxx src/encoder/plugins/OggSerial.hxx \
src/encoder/plugins/OggStream.hxx
endif endif
if ENABLE_WAVE_ENCODER if ENABLE_WAVE_ENCODER
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/WaveEncoderPlugin.cxx \ src/encoder/plugins/WaveEncoderPlugin.cxx \
src/encoder/WaveEncoderPlugin.hxx src/encoder/plugins/WaveEncoderPlugin.hxx
endif endif
if ENABLE_VORBIS_ENCODER if ENABLE_VORBIS_ENCODER
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/VorbisEncoderPlugin.cxx \ src/encoder/plugins/VorbisEncoderPlugin.cxx \
src/encoder/VorbisEncoderPlugin.hxx src/encoder/plugins/VorbisEncoderPlugin.hxx
endif endif
if HAVE_OPUS if HAVE_OPUS
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/OpusEncoderPlugin.cxx \ src/encoder/plugins/OpusEncoderPlugin.cxx \
src/encoder/OpusEncoderPlugin.hxx src/encoder/plugins/OpusEncoderPlugin.hxx
endif endif
if ENABLE_LAME_ENCODER if ENABLE_LAME_ENCODER
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/LameEncoderPlugin.cxx \ src/encoder/plugins/LameEncoderPlugin.cxx \
src/encoder/LameEncoderPlugin.hxx src/encoder/plugins/LameEncoderPlugin.hxx
endif endif
if ENABLE_TWOLAME_ENCODER if ENABLE_TWOLAME_ENCODER
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/TwolameEncoderPlugin.cxx \ src/encoder/plugins/TwolameEncoderPlugin.cxx \
src/encoder/TwolameEncoderPlugin.hxx src/encoder/plugins/TwolameEncoderPlugin.hxx
endif endif
if ENABLE_FLAC_ENCODER if ENABLE_FLAC_ENCODER
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/FlacEncoderPlugin.cxx src/encoder/FlacEncoderPlugin.hxx src/encoder/plugins/FlacEncoderPlugin.cxx \
src/encoder/plugins/FlacEncoderPlugin.hxx
endif endif
if ENABLE_SHINE_ENCODER if ENABLE_SHINE_ENCODER
libencoder_plugins_a_SOURCES += \ libencoder_plugins_a_SOURCES += \
src/encoder/ShineEncoderPlugin.cxx \ src/encoder/plugins/ShineEncoderPlugin.cxx \
src/encoder/ShineEncoderPlugin.hxx src/encoder/plugins/ShineEncoderPlugin.hxx
endif endif
else else
......
src/CommandLine.cxx
View file @ 655ad344
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
#include "util/OptionParser.hxx" #include "util/OptionParser.hxx"
#ifdef ENABLE_ENCODER #ifdef ENABLE_ENCODER
#include "EncoderList.hxx" #include "encoder/EncoderList.hxx"
#include "EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#endif #endif
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
......
src/EncoderList.cxx → src/encoder/EncoderList.cxx
View file @ 655ad344
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
#include "config.h" #include "config.h"
#include "EncoderList.hxx" #include "EncoderList.hxx"
#include "EncoderPlugin.hxx" #include "EncoderPlugin.hxx"
#include "encoder/NullEncoderPlugin.hxx" #include "plugins/NullEncoderPlugin.hxx"
#include "encoder/WaveEncoderPlugin.hxx" #include "plugins/WaveEncoderPlugin.hxx"
#include "encoder/VorbisEncoderPlugin.hxx" #include "plugins/VorbisEncoderPlugin.hxx"
#include "encoder/OpusEncoderPlugin.hxx" #include "plugins/OpusEncoderPlugin.hxx"
#include "encoder/FlacEncoderPlugin.hxx" #include "plugins/FlacEncoderPlugin.hxx"
#include "encoder/ShineEncoderPlugin.hxx" #include "plugins/ShineEncoderPlugin.hxx"
#include "encoder/LameEncoderPlugin.hxx" #include "plugins/LameEncoderPlugin.hxx"
#include "encoder/TwolameEncoderPlugin.hxx" #include "plugins/TwolameEncoderPlugin.hxx"
#include <string.h> #include <string.h>
......
src/encoder/FlacEncoderPlugin.cxx → src/encoder/plugins/FlacEncoderPlugin.cxx
View file @ 655ad344
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "FlacEncoderPlugin.hxx" #include "FlacEncoderPlugin.hxx"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "pcm/PcmBuffer.hxx" #include "pcm/PcmBuffer.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
......
src/encoder/LameEncoderPlugin.cxx → src/encoder/plugins/LameEncoderPlugin.cxx
View file @ 655ad344
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "LameEncoderPlugin.hxx" #include "LameEncoderPlugin.hxx"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
......
src/encoder/NullEncoderPlugin.cxx → src/encoder/plugins/NullEncoderPlugin.cxx
View file @ 655ad344
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "NullEncoderPlugin.hxx" #include "NullEncoderPlugin.hxx"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "util/Manual.hxx" #include "util/Manual.hxx"
#include "util/DynamicFifoBuffer.hxx" #include "util/DynamicFifoBuffer.hxx"
#include "Compiler.h" #include "Compiler.h"
......
src/encoder/OpusEncoderPlugin.cxx → src/encoder/plugins/OpusEncoderPlugin.cxx
View file @ 655ad344
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "OpusEncoderPlugin.hxx" #include "OpusEncoderPlugin.hxx"
#include "OggStream.hxx" #include "OggStream.hxx"
#include "OggSerial.hxx" #include "OggSerial.hxx"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
......
src/encoder/ShineEncoderPlugin.cxx → src/encoder/plugins/ShineEncoderPlugin.cxx
View file @ 655ad344
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "ShineEncoderPlugin.hxx" #include "ShineEncoderPlugin.hxx"
#include "config.h" #include "config.h"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
#include "util/Manual.hxx" #include "util/Manual.hxx"
......
src/encoder/TwolameEncoderPlugin.cxx → src/encoder/plugins/TwolameEncoderPlugin.cxx
View file @ 655ad344
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "TwolameEncoderPlugin.hxx" #include "TwolameEncoderPlugin.hxx"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
#include "util/NumberParser.hxx" #include "util/NumberParser.hxx"
......
src/encoder/VorbisEncoderPlugin.cxx → src/encoder/plugins/VorbisEncoderPlugin.cxx
View file @ 655ad344
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "VorbisEncoderPlugin.hxx" #include "VorbisEncoderPlugin.hxx"
#include "OggStream.hxx" #include "OggStream.hxx"
#include "OggSerial.hxx" #include "OggSerial.hxx"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
......
src/encoder/WaveEncoderPlugin.cxx → src/encoder/plugins/WaveEncoderPlugin.cxx
View file @ 655ad344
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "WaveEncoderPlugin.hxx" #include "WaveEncoderPlugin.hxx"
#include "EncoderAPI.hxx" #include "../EncoderAPI.hxx"
#include "system/ByteOrder.hxx" #include "system/ByteOrder.hxx"
#include "util/Manual.hxx" #include "util/Manual.hxx"
#include "util/DynamicFifoBuffer.hxx" #include "util/DynamicFifoBuffer.hxx"
......
src/output/HttpdOutputPlugin.cxx
View file @ 655ad344
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include "HttpdInternal.hxx" #include "HttpdInternal.hxx"
#include "HttpdClient.hxx" #include "HttpdClient.hxx"
#include "OutputAPI.hxx" #include "OutputAPI.hxx"
#include "EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#include "EncoderList.hxx" #include "encoder/EncoderList.hxx"
#include "system/Resolver.hxx" #include "system/Resolver.hxx"
#include "Page.hxx" #include "Page.hxx"
#include "IcyMetaDataServer.hxx" #include "IcyMetaDataServer.hxx"
......
src/output/RecorderOutputPlugin.cxx
View file @ 655ad344
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "RecorderOutputPlugin.hxx" #include "RecorderOutputPlugin.hxx"
#include "OutputAPI.hxx" #include "OutputAPI.hxx"
#include "EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#include "EncoderList.hxx" #include "encoder/EncoderList.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
src/output/ShoutOutputPlugin.cxx
View file @ 655ad344
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "config.h" #include "config.h"
#include "ShoutOutputPlugin.hxx" #include "ShoutOutputPlugin.hxx"
#include "OutputAPI.hxx" #include "OutputAPI.hxx"
#include "EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#include "EncoderList.hxx" #include "encoder/EncoderList.hxx"
#include "ConfigError.hxx" #include "ConfigError.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
......
test/run_encoder.cxx
View file @ 655ad344
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "EncoderList.hxx" #include "encoder/EncoderList.hxx"
#include "EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "AudioParser.hxx" #include "AudioParser.hxx"
#include "ConfigData.hxx" #include "ConfigData.hxx"
......
test/test_vorbis_encoder.cxx
View file @ 655ad344
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "EncoderList.hxx" #include "encoder/EncoderList.hxx"
#include "EncoderPlugin.hxx" #include "encoder/EncoderPlugin.hxx"
#include "AudioFormat.hxx" #include "AudioFormat.hxx"
#include "ConfigData.hxx" #include "ConfigData.hxx"
#include "stdbin.h" #include "stdbin.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment