diff options
Diffstat (limited to 'src/decoder')
23 files changed, 25 insertions, 28 deletions
diff --git a/src/decoder/AdPlugDecoderPlugin.cxx b/src/decoder/AdPlugDecoderPlugin.cxx index f3b986fc8..51a3f7ea7 100644 --- a/src/decoder/AdPlugDecoderPlugin.cxx +++ b/src/decoder/AdPlugDecoderPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "AdPlugDecoderPlugin.h" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "DecoderAPI.hxx" #include "CheckAudioFormat.hxx" #include "util/Error.hxx" diff --git a/src/decoder/AudiofileDecoderPlugin.cxx b/src/decoder/AudiofileDecoderPlugin.cxx index d19249932..6b638bb3f 100644 --- a/src/decoder/AudiofileDecoderPlugin.cxx +++ b/src/decoder/AudiofileDecoderPlugin.cxx @@ -22,7 +22,7 @@ #include "DecoderAPI.hxx" #include "InputStream.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "util/Error.hxx" #include <audiofile.h> diff --git a/src/decoder/DsdLib.cxx b/src/decoder/DsdLib.cxx index b093d5d66..7135c9903 100644 --- a/src/decoder/DsdLib.cxx +++ b/src/decoder/DsdLib.cxx @@ -28,7 +28,7 @@ #include "DecoderAPI.hxx" #include "InputStream.hxx" #include "util/bit_reverse.h" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "tag/TagId3.hxx" #include "util/Error.hxx" diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx index 71226b8fb..49b0c601d 100644 --- a/src/decoder/DsdiffDecoderPlugin.cxx +++ b/src/decoder/DsdiffDecoderPlugin.cxx @@ -33,7 +33,7 @@ #include "CheckAudioFormat.hxx" #include "util/bit_reverse.h" #include "util/Error.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "DsdLib.hxx" #include <unistd.h> diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx index 5f2422e77..275f34929 100644 --- a/src/decoder/DsfDecoderPlugin.cxx +++ b/src/decoder/DsfDecoderPlugin.cxx @@ -35,7 +35,7 @@ #include "util/bit_reverse.h" #include "util/Error.hxx" #include "DsdLib.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include <unistd.h> #include <stdio.h> /* for SEEK_SET, SEEK_CUR */ diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx index 7540413f5..c8acfb521 100644 --- a/src/decoder/FaadDecoderPlugin.cxx +++ b/src/decoder/FaadDecoderPlugin.cxx @@ -23,7 +23,7 @@ #include "DecoderBuffer.hxx" #include "InputStream.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index b9297ae2a..a0ac5b8fb 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -24,7 +24,7 @@ #include "FfmpegDecoderPlugin.hxx" #include "DecoderAPI.hxx" #include "FfmpegMetaData.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "InputStream.hxx" #include "CheckAudioFormat.hxx" #include "util/Error.hxx" diff --git a/src/decoder/FfmpegMetaData.cxx b/src/decoder/FfmpegMetaData.cxx index 132eefdaf..f4b7386ef 100644 --- a/src/decoder/FfmpegMetaData.cxx +++ b/src/decoder/FfmpegMetaData.cxx @@ -23,7 +23,7 @@ #include "config.h" #include "FfmpegMetaData.hxx" #include "tag/TagTable.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "ffmpeg" diff --git a/src/decoder/FlacMetadata.cxx b/src/decoder/FlacMetadata.cxx index f3b5ba81c..a27fec5d2 100644 --- a/src/decoder/FlacMetadata.cxx +++ b/src/decoder/FlacMetadata.cxx @@ -20,8 +20,8 @@ #include "config.h" #include "FlacMetadata.hxx" #include "XiphTags.hxx" -#include "Tag.hxx" -#include "TagHandler.hxx" +#include "tag/Tag.hxx" +#include "tag/TagHandler.hxx" #include "tag/TagTable.hxx" #include "replay_gain_info.h" diff --git a/src/decoder/GmeDecoderPlugin.cxx b/src/decoder/GmeDecoderPlugin.cxx index 006161c78..cc31c6bab 100644 --- a/src/decoder/GmeDecoderPlugin.cxx +++ b/src/decoder/GmeDecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "GmeDecoderPlugin.hxx" #include "DecoderAPI.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx index 88a451412..dc2d0b806 100644 --- a/src/decoder/MadDecoderPlugin.cxx +++ b/src/decoder/MadDecoderPlugin.cxx @@ -24,7 +24,7 @@ #include "ConfigGlobal.hxx" #include "tag/TagId3.hxx" #include "tag/TagRva2.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "CheckAudioFormat.hxx" #include "util/Error.hxx" diff --git a/src/decoder/MikmodDecoderPlugin.cxx b/src/decoder/MikmodDecoderPlugin.cxx index 0de876f06..f98b22a6d 100644 --- a/src/decoder/MikmodDecoderPlugin.cxx +++ b/src/decoder/MikmodDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "MikmodDecoderPlugin.hxx" #include "DecoderAPI.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "system/FatalError.hxx" #include <glib.h> diff --git a/src/decoder/ModplugDecoderPlugin.cxx b/src/decoder/ModplugDecoderPlugin.cxx index 0305b582d..b5c02507a 100644 --- a/src/decoder/ModplugDecoderPlugin.cxx +++ b/src/decoder/ModplugDecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "ModplugDecoderPlugin.hxx" #include "DecoderAPI.hxx" #include "InputStream.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include <glib.h> #include <modplug.h> diff --git a/src/decoder/MpcdecDecoderPlugin.cxx b/src/decoder/MpcdecDecoderPlugin.cxx index 87d868f19..d9c7a17d1 100644 --- a/src/decoder/MpcdecDecoderPlugin.cxx +++ b/src/decoder/MpcdecDecoderPlugin.cxx @@ -22,7 +22,7 @@ #include "DecoderAPI.hxx" #include "InputStream.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "util/Error.hxx" #include <mpc/mpcdec.h> diff --git a/src/decoder/Mpg123DecoderPlugin.cxx b/src/decoder/Mpg123DecoderPlugin.cxx index c30455121..a44fc1241 100644 --- a/src/decoder/Mpg123DecoderPlugin.cxx +++ b/src/decoder/Mpg123DecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "Mpg123DecoderPlugin.hxx" #include "DecoderAPI.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "util/Error.hxx" #include <glib.h> diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx index 2d378ef6c..9d852102b 100644 --- a/src/decoder/OpusDecoderPlugin.cxx +++ b/src/decoder/OpusDecoderPlugin.cxx @@ -27,7 +27,7 @@ #include "DecoderAPI.hxx" #include "OggCodec.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "InputStream.hxx" #include "util/Error.hxx" diff --git a/src/decoder/OpusTags.cxx b/src/decoder/OpusTags.cxx index a63dc1c24..f09d79c3b 100644 --- a/src/decoder/OpusTags.cxx +++ b/src/decoder/OpusTags.cxx @@ -21,7 +21,7 @@ #include "OpusTags.hxx" #include "OpusReader.hxx" #include "XiphTags.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include <stdint.h> #include <string.h> diff --git a/src/decoder/SndfileDecoderPlugin.cxx b/src/decoder/SndfileDecoderPlugin.cxx index f61e7c2c2..252e88df5 100644 --- a/src/decoder/SndfileDecoderPlugin.cxx +++ b/src/decoder/SndfileDecoderPlugin.cxx @@ -22,7 +22,7 @@ #include "DecoderAPI.hxx" #include "InputStream.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "util/Error.hxx" #include <sndfile.h> diff --git a/src/decoder/VorbisComments.cxx b/src/decoder/VorbisComments.cxx index eb64897d1..48c603ea4 100644 --- a/src/decoder/VorbisComments.cxx +++ b/src/decoder/VorbisComments.cxx @@ -20,9 +20,9 @@ #include "config.h" #include "VorbisComments.hxx" #include "XiphTags.hxx" -#include "Tag.hxx" +#include "tag/Tag.hxx" #include "tag/TagTable.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "replay_gain_info.h" #include <glib.h> diff --git a/src/decoder/VorbisDecoderPlugin.cxx b/src/decoder/VorbisDecoderPlugin.cxx index d6b0f5eb0..2b175912d 100644 --- a/src/decoder/VorbisDecoderPlugin.cxx +++ b/src/decoder/VorbisDecoderPlugin.cxx @@ -26,7 +26,7 @@ #include "util/Error.hxx" #include "util/UriUtil.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #ifndef HAVE_TREMOR #define OV_EXCLUDE_STATIC_CALLBACKS diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx index f37bd3f12..d0122ad87 100644 --- a/src/decoder/WavpackDecoderPlugin.cxx +++ b/src/decoder/WavpackDecoderPlugin.cxx @@ -22,7 +22,7 @@ #include "DecoderAPI.hxx" #include "InputStream.hxx" #include "CheckAudioFormat.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "tag/ApeTag.hxx" #include "util/Error.hxx" diff --git a/src/decoder/WildmidiDecoderPlugin.cxx b/src/decoder/WildmidiDecoderPlugin.cxx index 738073d52..daa0e0cc9 100644 --- a/src/decoder/WildmidiDecoderPlugin.cxx +++ b/src/decoder/WildmidiDecoderPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "WildmidiDecoderPlugin.hxx" #include "DecoderAPI.hxx" -#include "TagHandler.hxx" +#include "tag/TagHandler.hxx" #include "util/Error.hxx" #include "fs/Path.hxx" #include "fs/FileSystem.hxx" diff --git a/src/decoder/sidplay_decoder_plugin.cxx b/src/decoder/sidplay_decoder_plugin.cxx index 4e26efecb..19969c00a 100644 --- a/src/decoder/sidplay_decoder_plugin.cxx +++ b/src/decoder/sidplay_decoder_plugin.cxx @@ -19,10 +19,7 @@ #include "config.h" #include "../DecoderAPI.hxx" - -extern "C" { -#include "TagHandler.hxx" -} +#include "tag/TagHandler.hxx" #include <errno.h> #include <stdlib.h> |