Tag, ...: move to libtag.a

Makefile.am

@@ -201,14 +201,8 @@ src_mpd_SOURCES = \
 	src/SongSort.cxx src/SongSort.hxx \
 	src/StateFile.cxx src/StateFile.hxx \
 	src/Stats.cxx \
-	src/TagType.h \
-	src/Tag.cxx src/Tag.hxx \
-	src/TagInternal.hxx \
-	src/TagNames.c \
-	src/TagPool.cxx src/TagPool.hxx \
 	src/TagPrint.cxx src/TagPrint.hxx \
 	src/TagSave.cxx src/TagSave.hxx \
-	src/TagHandler.cxx src/TagHandler.hxx \
 	src/TagFile.cxx src/TagFile.hxx \
 	src/TextFile.cxx src/TextFile.hxx \
 	src/TextInputStream.cxx \
@@ -428,7 +422,13 @@ TAG_LIBS = \
 	$(ID3TAG_LIBS)
 
 libtag_a_SOURCES =\
-	src/tag/TagTable.cxx src/TagTable.hxx \
+	src/tag/TagType.h \
+	src/tag/Tag.cxx src/tag/Tag.hxx \
+	src/tag/TagHandler.cxx src/tag/TagHandler.hxx \
+	src/tag/TagInternal.hxx \
+	src/tag/TagNames.c \
+	src/tag/TagPool.cxx src/tag/TagPool.hxx \
+	src/tag/TagTable.cxx src/tag/TagTable.hxx \
 	src/tag/ApeLoader.cxx src/tag/ApeLoader.hxx \
 	src/tag/ApeReplayGain.cxx src/tag/ApeReplayGain.hxx \
 	src/tag/ApeTag.cxx src/tag/ApeTag.hxx
@@ -1074,6 +1074,7 @@ test_run_resolver_SOURCES = test/run_resolver.cxx
 
 test_DumpDatabase_LDADD = \
 	$(DB_LIBS) \
+	$(TAG_LIBS) \
 	libconf.a \
 	libutil.a \
 	libsystem.a \
@@ -1087,13 +1088,14 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
 	src/PlaylistVector.cxx src/PlaylistDatabase.cxx \
 	src/DatabaseLock.cxx src/DatabaseSave.cxx \
 	src/Song.cxx src/SongSave.cxx src/SongSort.cxx \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
+	src/TagSave.cxx \
 	src/SongFilter.cxx \
 	src/TextFile.cxx
 
 test_run_input_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
+	$(TAG_LIBS) \
 	libconf.a \
 	libutil.a \
 	libevent.a \
@@ -1103,13 +1105,14 @@ test_run_input_LDADD = \
 test_run_input_SOURCES = test/run_input.cxx \
 	test/stdbin.h \
 	src/IOThread.cxx \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx
+	src/TagSave.cxx
 
 if ENABLE_ARCHIVE
 
 test_visit_archive_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
+	$(TAG_LIBS) \
 	libconf.a \
 	libutil.a \
 	libevent.a \
@@ -1118,8 +1121,7 @@ test_visit_archive_LDADD = \
 	$(GLIB_LIBS)
 test_visit_archive_SOURCES = test/visit_archive.cxx \
 	src/IOThread.cxx \
-	src/InputStream.cxx \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx
+	src/InputStream.cxx
 
 if ENABLE_DESPOTIFY
 test_visit_archive_SOURCES += src/DespotifyUtils.cxx
@@ -1130,6 +1132,7 @@ endif
 test_dump_text_file_LDADD = \
 	$(INPUT_LIBS) \
 	$(ARCHIVE_LIBS) \
+	$(TAG_LIBS) \
 	libconf.a \
 	libevent.a \
 	libfs.a \
@@ -1139,7 +1142,6 @@ test_dump_text_file_LDADD = \
 test_dump_text_file_SOURCES = test/dump_text_file.cxx \
 	test/stdbin.h \
 	src/IOThread.cxx \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
 	src/TextInputStream.cxx
 
 test_dump_playlist_LDADD = \
@@ -1159,8 +1161,8 @@ test_dump_playlist_LDADD = \
 test_dump_playlist_SOURCES = test/dump_playlist.cxx \
 	$(DECODER_SRC) \
 	src/IOThread.cxx \
-	src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
-	src/TagHandler.cxx src/TagFile.cxx \
+	src/Song.cxx src/TagSave.cxx \
+	src/TagFile.cxx \
 	src/CheckAudioFormat.cxx \
 	src/TextInputStream.cxx \
 	src/cue/CueParser.cxx src/cue/CueParser.hxx
@@ -1186,7 +1188,6 @@ test_run_decoder_LDADD = \
 test_run_decoder_SOURCES = test/run_decoder.cxx \
 	test/stdbin.h \
 	src/IOThread.cxx \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \
 	src/ReplayGainInfo.cxx \
 	src/AudioFormat.cxx src/CheckAudioFormat.cxx \
 	$(ARCHIVE_SRC) \
@@ -1208,7 +1209,6 @@ test_read_tags_LDADD = \
 	$(GLIB_LIBS)
 test_read_tags_SOURCES = test/read_tags.cxx \
 	src/IOThread.cxx \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \
 	src/ReplayGainInfo.cxx \
 	src/CheckAudioFormat.cxx \
 	$(DECODER_SRC)
@@ -1218,8 +1218,7 @@ test_dump_rva2_LDADD = \
 	$(TAG_LIBS) \
 	libutil.a \
 	$(GLIB_LIBS)
-test_dump_rva2_SOURCES = test/dump_rva2.cxx \
-	src/TagHandler.cxx
+test_dump_rva2_SOURCES = test/dump_rva2.cxx
 endif
 
 test_run_filter_LDADD = \
@@ -1251,7 +1250,6 @@ if ENABLE_ENCODER
 noinst_PROGRAMS += test/run_encoder
 test_run_encoder_SOURCES = test/run_encoder.cxx \
 	test/stdbin.h \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
 	src/CheckAudioFormat.cxx \
 	src/AudioFormat.cxx \
 	src/AudioParser.cxx
@@ -1270,7 +1268,6 @@ if ENABLE_VORBIS_ENCODER
 noinst_PROGRAMS += test/test_vorbis_encoder
 test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \
 	test/stdbin.h \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
 	src/CheckAudioFormat.cxx \
 	src/AudioFormat.cxx \
 	src/AudioParser.cxx \
@@ -1280,6 +1277,7 @@ test_test_vorbis_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
 test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
 	$(ENCODER_LIBS) \
 	$(PCM_LIBS) \
+	$(TAG_LIBS) \
 	libconf.a \
 	libsystem.a \
 	libfs.a \
@@ -1320,6 +1318,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
 	$(ENCODER_LIBS) \
 	libmixer_plugins.a \
 	$(FILTER_LIBS) \
+	$(TAG_LIBS) \
 	libconf.a \
 	libevent.a \
 	libfs.a \
@@ -1334,7 +1333,6 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/AudioFormat.cxx \
 	src/AudioParser.cxx \
 	src/Timer.cxx \
-	src/Tag.cxx src/TagNames.c src/TagPool.cxx \
 	src/Page.cxx \
 	src/OutputError.cxx \
 	src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \

src/AllCommands.cxx

@@ -28,7 +28,7 @@
 #include "MessageCommands.hxx"
 #include "OtherCommands.hxx"
 #include "Permission.hxx"
-#include "Tag.hxx"
+#include "tag/TagType.h"
 #include "protocol/Result.hxx"
 #include "Client.hxx"
 #include "util/Tokenizer.hxx"

src/CrossFade.cxx

@@ -21,7 +21,6 @@
 #include "CrossFade.hxx"
 #include "MusicChunk.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"
 
 #include <cmath>
 

src/DatabaseCommands.cxx

@@ -25,7 +25,7 @@
 #include "DatabaseSelection.hxx"
 #include "CommandError.hxx"
 #include "ClientInternal.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"
 #include "SongFilter.hxx"

src/DatabaseHelpers.cxx

@@ -20,7 +20,7 @@
 #include "DatabaseHelpers.hxx"
 #include "DatabasePlugin.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <functional>
 #include <set>

src/DatabaseHelpers.hxx

@@ -21,7 +21,7 @@
 #define MPD_MEMORY_DATABASE_PLUGIN_HXX
 
 #include "DatabaseVisitor.hxx"
-#include "TagType.h"
+#include "tag/TagType.h"
 #include "gcc.h"
 
 class Error;

src/DatabasePlugin.hxx

@@ -27,7 +27,7 @@
 #define MPD_DATABASE_PLUGIN_HXX
 
 #include "DatabaseVisitor.hxx"
-#include "TagType.h"
+#include "tag/TagType.h"
 #include "gcc.h"
 
 struct config_param;

src/DatabasePrint.cxx

@@ -26,7 +26,7 @@
 #include "TimePrint.hxx"
 #include "Directory.hxx"
 #include "Client.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabasePlugin.hxx"

src/DatabaseSave.cxx

@@ -25,8 +25,8 @@
 #include "DirectorySave.hxx"
 #include "Song.hxx"
 #include "TextFile.hxx"
-#include "TagInternal.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagInternal.hxx"
 #include "fs/Path.hxx"
 #include "util/Error.hxx"
 

src/DecoderAPI.hxx

@@ -31,7 +31,7 @@
 #include "DecoderCommand.hxx"
 #include "DecoderPlugin.hxx"
 #include "replay_gain_info.h"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
 #include "ConfigData.hxx"
 

src/DecoderInternal.cxx

@@ -23,7 +23,7 @@
 #include "MusicPipe.hxx"
 #include "MusicBuffer.hxx"
 #include "MusicChunk.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <assert.h>
 

src/DecoderThread.cxx

@@ -28,7 +28,7 @@
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
 #include "DecoderAPI.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "InputStream.hxx"
 #include "DecoderList.hxx"
 #include "util/UriUtil.hxx"

src/DespotifyUtils.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "DespotifyUtils.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigOption.hxx"
 

src/EncoderAPI.hxx

@@ -27,7 +27,7 @@
 
 #include "EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigData.hxx"
 
 #endif

src/IcyMetaDataParser.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "IcyMetaDataParser.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <glib.h>
 

src/IcyMetaDataServer.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "IcyMetaDataServer.hxx"
 #include "Page.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <glib.h>
 

src/IcyMetaDataServer.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_ICY_META_DATA_SERVER_HXX
 #define MPD_ICY_META_DATA_SERVER_HXX
 
-#include "TagType.h"
+#include "tag/TagType.h"
 
 struct Tag;
 class Page;

src/Main.cxx

@@ -38,7 +38,7 @@
 #include "Partition.hxx"
 #include "Volume.hxx"
 #include "OutputAll.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "replay_gain_config.h"
 #include "Idle.hxx"
 #include "SignalHandlers.hxx"

src/MusicChunk.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "MusicChunk.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <assert.h>
 

src/OutputAPI.hxx

@@ -23,7 +23,7 @@
 #include "OutputPlugin.hxx"
 #include "OutputInternal.hxx"
 #include "AudioFormat.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigData.hxx"
 
 #endif

src/PlayerThread.cxx

@@ -30,7 +30,7 @@
 #include "CrossFade.hxx"
 #include "PlayerControl.hxx"
 #include "OutputAll.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Idle.hxx"
 #include "GlobalEvents.hxx"
 

src/PlaylistSong.cxx

@@ -23,7 +23,7 @@
 #include "DatabasePlugin.hxx"
 #include "DatabaseGlue.hxx"
 #include "ls.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "fs/Path.hxx"
 #include "util/UriUtil.hxx"
 #include "util/Error.hxx"

src/Song.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "Song.hxx"
 #include "Directory.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <glib.h>
 

src/SongFilter.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "SongFilter.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <glib.h>
 

src/SongSave.cxx

@@ -23,7 +23,7 @@
 #include "TagSave.hxx"
 #include "Directory.hxx"
 #include "TextFile.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"

src/SongSort.cxx

@@ -21,7 +21,7 @@
 #include "SongSort.hxx"
 #include "Song.hxx"
 #include "util/list.h"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 extern "C" {
 #include "util/list_sort.h"

src/SongUpdate.cxx

@@ -25,11 +25,11 @@
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
 #include "fs/FileSystem.hxx"
-#include "Tag.hxx"
 #include "InputStream.hxx"
 #include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
-#include "TagHandler.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/ApeTag.hxx"
 

src/TagPrint.cxx

@@ -19,8 +19,8 @@
 
 #include "config.h"
 #include "TagPrint.hxx"
-#include "Tag.hxx"
-#include "TagInternal.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagInternal.hxx"
 #include "Song.hxx"
 #include "Client.hxx"
 

src/TagSave.cxx

@@ -19,8 +19,7 @@
 
 #include "config.h"
 #include "TagSave.hxx"
-#include "Tag.hxx"
-#include "TagInternal.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"
 
 void

src/UpdateContainer.cxx

@@ -27,8 +27,8 @@
 #include "DecoderPlugin.hxx"
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
-#include "TagHandler.hxx"
-#include "Tag.hxx"
+#include "tag/TagHandler.hxx"
+#include "tag/Tag.hxx"
 
 #include <glib.h>
 

src/cue/CueParser.cxx

@@ -21,7 +21,7 @@
 #include "CueParser.hxx"
 #include "util/StringUtil.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <glib.h>
 

src/db/ProxyDatabasePlugin.cxx

@@ -27,7 +27,7 @@
 #include "Song.hxx"
 #include "gcc.h"
 #include "ConfigData.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 

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"

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>

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"
 

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>

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 */

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"
 

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"

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"

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"
 

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"
 

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"
 

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>

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>

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>

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>

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"
 

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>

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>

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>

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

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"
 

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"

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>

src/encoder/VorbisEncoderPlugin.cxx

@@ -21,7 +21,7 @@
 #include "VorbisEncoderPlugin.hxx"
 #include "OggStream.hxx"
 #include "EncoderAPI.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
 #include "ConfigError.hxx"
 #include "util/Error.hxx"

src/input/CurlInputPlugin.cxx

@@ -24,7 +24,7 @@
 #include "InputPlugin.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigData.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "IcyMetaDataParser.hxx"
 #include "event/MultiSocketMonitor.hxx"
 #include "event/Call.hxx"

src/input/DespotifyInputPlugin.cxx

@@ -23,7 +23,7 @@
 #include "InputInternal.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 extern "C" {
 #include <despotify.h>

src/input/RewindInputPlugin.cxx

@@ -22,7 +22,7 @@
 #include "InputInternal.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 
 #include <assert.h>
 #include <string.h>

src/playlist/AsxPlaylistPlugin.cxx

@@ -23,7 +23,7 @@
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 
 #include <glib.h>

src/playlist/CuePlaylistPlugin.cxx

@@ -21,7 +21,7 @@
 #include "CuePlaylistPlugin.hxx"
 #include "PlaylistPlugin.hxx"
 #include "SongEnumerator.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"
 #include "cue/CueParser.hxx"
 #include "TextInputStream.hxx"

src/playlist/DespotifyPlaylistPlugin.cxx

@@ -22,7 +22,7 @@
 #include "DespotifyUtils.hxx"
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "Song.hxx"
 
 extern "C" {

src/playlist/EmbeddedCuePlaylistPlugin.cxx

@@ -27,8 +27,8 @@
 #include "EmbeddedCuePlaylistPlugin.hxx"
 #include "PlaylistPlugin.hxx"
 #include "SongEnumerator.hxx"
-#include "Tag.hxx"
-#include "TagHandler.hxx"
+#include "tag/Tag.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/ApeTag.hxx"
 #include "Song.hxx"

src/playlist/ExtM3uPlaylistPlugin.cxx

@@ -22,7 +22,7 @@
 #include "PlaylistPlugin.hxx"
 #include "SongEnumerator.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/StringUtil.hxx"
 #include "TextInputStream.hxx"
 

src/playlist/PlsPlaylistPlugin.cxx

@@ -23,7 +23,7 @@
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 
 #include <glib.h>

src/playlist/RssPlaylistPlugin.cxx

@@ -23,7 +23,7 @@
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 
 #include <glib.h>

src/playlist/SoundCloudPlaylistPlugin.cxx

@@ -24,7 +24,7 @@
 #include "ConfigData.hxx"
 #include "InputStream.hxx"
 #include "Song.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 
 #include <glib.h>

src/playlist/XspfPlaylistPlugin.cxx

@@ -22,7 +22,7 @@
 #include "PlaylistPlugin.hxx"
 #include "MemorySongEnumerator.hxx"
 #include "InputStream.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 
 #include <glib.h>

test/DumpDatabase.cxx

@@ -26,7 +26,7 @@
 #include "PlaylistVector.hxx"
 #include "ConfigGlobal.hxx"
 #include "ConfigData.hxx"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "fs/Path.hxx"
 #include "util/Error.hxx"
 

test/dump_rva2.cxx

@@ -18,11 +18,11 @@
  */
 
 #include "config.h"
+#include "tag/Tag.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/TagRva2.hxx"
 #include "replay_gain_info.h"
 #include "ConfigGlobal.hxx"
-#include "Tag.hxx"
 #include "util/Error.hxx"
 
 #include <id3tag.h>

test/read_tags.cxx

@@ -24,7 +24,7 @@
 #include "InputInit.hxx"
 #include "InputStream.hxx"
 #include "AudioFormat.hxx"
-#include "TagHandler.hxx"
+#include "tag/TagHandler.hxx"
 #include "tag/TagId3.hxx"
 #include "tag/ApeTag.hxx"
 #include "util/Error.hxx"

test/run_input.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "TagSave.hxx"
 #include "stdbin.h"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigGlobal.hxx"
 #include "InputStream.hxx"
 #include "InputInit.hxx"

test/test_vorbis_encoder.cxx

@@ -23,7 +23,7 @@
 #include "AudioFormat.hxx"
 #include "ConfigData.hxx"
 #include "stdbin.h"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "util/Error.hxx"
 
 #include <stddef.h>

test/visit_archive.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "stdbin.h"
-#include "Tag.hxx"
+#include "tag/Tag.hxx"
 #include "ConfigGlobal.hxx"
 #include "IOThread.hxx"
 #include "InputInit.hxx"