From 5101ef4b028c8f661801f78ba0fe73fab0e80f7f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 4 Sep 2013 23:46:20 +0200 Subject: [PATCH] Tag*: move libtag.a sources to src/tag/ --- Makefile.am | 22 +++++++++------------- src/DecoderThread.cxx | 2 +- src/SongUpdate.cxx | 4 ++-- src/decoder/DsdLib.cxx | 2 +- src/decoder/MadDecoderPlugin.cxx | 4 ++-- src/decoder/WavpackDecoderPlugin.cxx | 2 +- src/playlist/EmbeddedCuePlaylistPlugin.cxx | 4 ++-- src/{ => tag}/ApeLoader.cxx | 0 src/{ => tag}/ApeLoader.hxx | 0 src/{ => tag}/ApeReplayGain.cxx | 0 src/{ => tag}/ApeReplayGain.hxx | 0 src/{ => tag}/ApeTag.cxx | 0 src/{ => tag}/ApeTag.hxx | 0 src/{ => tag}/TagId3.cxx | 0 src/{ => tag}/TagId3.hxx | 0 src/{ => tag}/TagRva2.cxx | 0 src/{ => tag}/TagRva2.hxx | 0 src/{ => tag}/aiff.c | 0 src/{ => tag}/aiff.h | 0 src/{ => tag}/riff.c | 0 src/{ => tag}/riff.h | 0 test/dump_rva2.cxx | 4 ++-- test/read_tags.cxx | 4 ++-- 23 files changed, 22 insertions(+), 26 deletions(-) rename src/{ => tag}/ApeLoader.cxx (100%) rename src/{ => tag}/ApeLoader.hxx (100%) rename src/{ => tag}/ApeReplayGain.cxx (100%) rename src/{ => tag}/ApeReplayGain.hxx (100%) rename src/{ => tag}/ApeTag.cxx (100%) rename src/{ => tag}/ApeTag.hxx (100%) rename src/{ => tag}/TagId3.cxx (100%) rename src/{ => tag}/TagId3.hxx (100%) rename src/{ => tag}/TagRva2.cxx (100%) rename src/{ => tag}/TagRva2.hxx (100%) rename src/{ => tag}/aiff.c (100%) rename src/{ => tag}/aiff.h (100%) rename src/{ => tag}/riff.c (100%) rename src/{ => tag}/riff.h (100%) diff --git a/Makefile.am b/Makefile.am index 2ad19c3c8..cfdc42c6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,8 +63,6 @@ mpd_headers = \ src/open.h \ src/Playlist.hxx \ src/poison.h \ - src/riff.h \ - src/aiff.h \ src/replay_gain_config.h \ src/replay_gain_info.h \ src/TimePrint.cxx src/TimePrint.hxx \ @@ -432,15 +430,16 @@ TAG_LIBS = \ $(ID3TAG_LIBS) libtag_a_SOURCES =\ - src/ApeLoader.cxx src/ApeLoader.hxx \ - src/ApeReplayGain.cxx src/ApeReplayGain.hxx \ - src/ApeTag.cxx src/ApeTag.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 if HAVE_ID3TAG libtag_a_SOURCES += \ - src/TagId3.cxx src/TagId3.hxx \ - src/TagRva2.cxx src/TagRva2.hxx \ - src/riff.c src/aiff.c + src/tag/TagId3.cxx src/tag/TagId3.hxx \ + src/tag/TagRva2.cxx src/tag/TagRva2.hxx \ + src/tag/riff.c src/tag/riff.h \ + src/tag/aiff.c src/tag/aiff.h endif # decoder plugins @@ -1218,14 +1217,11 @@ test_read_tags_SOURCES = test/read_tags.cxx \ if HAVE_ID3TAG test_dump_rva2_LDADD = \ - $(ID3TAG_LIBS) \ + $(TAG_LIBS) \ libutil.a \ $(GLIB_LIBS) test_dump_rva2_SOURCES = test/dump_rva2.cxx \ - src/riff.c src/aiff.c \ - src/TagHandler.cxx \ - src/TagId3.cxx \ - src/TagRva2.cxx + src/TagHandler.cxx endif test_run_filter_LDADD = \ diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx index 5a44f0453..eb463973e 100644 --- a/src/DecoderThread.cxx +++ b/src/DecoderThread.cxx @@ -33,7 +33,7 @@ #include "DecoderList.hxx" #include "util/UriUtil.hxx" #include "util/Error.hxx" -#include "ApeReplayGain.hxx" +#include "tag/ApeReplayGain.hxx" #include diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index d6f60c5cb..7e374e759 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -30,8 +30,8 @@ #include "DecoderPlugin.hxx" #include "DecoderList.hxx" #include "TagHandler.hxx" -#include "TagId3.hxx" -#include "ApeTag.hxx" +#include "tag/TagId3.hxx" +#include "tag/ApeTag.hxx" #include diff --git a/src/decoder/DsdLib.cxx b/src/decoder/DsdLib.cxx index a9cfc9147..eb3d537b9 100644 --- a/src/decoder/DsdLib.cxx +++ b/src/decoder/DsdLib.cxx @@ -28,7 +28,7 @@ #include "DecoderAPI.hxx" #include "util/bit_reverse.h" #include "TagHandler.hxx" -#include "TagId3.hxx" +#include "tag/TagId3.hxx" #include "util/Error.hxx" #include diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx index f77563fb2..381a5703f 100644 --- a/src/decoder/MadDecoderPlugin.cxx +++ b/src/decoder/MadDecoderPlugin.cxx @@ -21,8 +21,8 @@ #include "MadDecoderPlugin.hxx" #include "DecoderAPI.hxx" #include "conf.h" -#include "TagId3.hxx" -#include "TagRva2.hxx" +#include "tag/TagId3.hxx" +#include "tag/TagRva2.hxx" #include "TagHandler.hxx" #include "CheckAudioFormat.hxx" #include "util/Error.hxx" diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx index 528ecdc3c..88394f2c1 100644 --- a/src/decoder/WavpackDecoderPlugin.cxx +++ b/src/decoder/WavpackDecoderPlugin.cxx @@ -23,7 +23,7 @@ #include "InputStream.hxx" #include "CheckAudioFormat.hxx" #include "TagHandler.hxx" -#include "ApeTag.hxx" +#include "tag/ApeTag.hxx" #include "util/Error.hxx" #include diff --git a/src/playlist/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/EmbeddedCuePlaylistPlugin.cxx index 978c05026..237bccdd5 100644 --- a/src/playlist/EmbeddedCuePlaylistPlugin.cxx +++ b/src/playlist/EmbeddedCuePlaylistPlugin.cxx @@ -28,8 +28,8 @@ #include "PlaylistPlugin.hxx" #include "Tag.hxx" #include "TagHandler.hxx" -#include "TagId3.hxx" -#include "ApeTag.hxx" +#include "tag/TagId3.hxx" +#include "tag/ApeTag.hxx" #include "Song.hxx" #include "TagFile.hxx" #include "cue/CueParser.hxx" diff --git a/src/ApeLoader.cxx b/src/tag/ApeLoader.cxx similarity index 100% rename from src/ApeLoader.cxx rename to src/tag/ApeLoader.cxx diff --git a/src/ApeLoader.hxx b/src/tag/ApeLoader.hxx similarity index 100% rename from src/ApeLoader.hxx rename to src/tag/ApeLoader.hxx diff --git a/src/ApeReplayGain.cxx b/src/tag/ApeReplayGain.cxx similarity index 100% rename from src/ApeReplayGain.cxx rename to src/tag/ApeReplayGain.cxx diff --git a/src/ApeReplayGain.hxx b/src/tag/ApeReplayGain.hxx similarity index 100% rename from src/ApeReplayGain.hxx rename to src/tag/ApeReplayGain.hxx diff --git a/src/ApeTag.cxx b/src/tag/ApeTag.cxx similarity index 100% rename from src/ApeTag.cxx rename to src/tag/ApeTag.cxx diff --git a/src/ApeTag.hxx b/src/tag/ApeTag.hxx similarity index 100% rename from src/ApeTag.hxx rename to src/tag/ApeTag.hxx diff --git a/src/TagId3.cxx b/src/tag/TagId3.cxx similarity index 100% rename from src/TagId3.cxx rename to src/tag/TagId3.cxx diff --git a/src/TagId3.hxx b/src/tag/TagId3.hxx similarity index 100% rename from src/TagId3.hxx rename to src/tag/TagId3.hxx diff --git a/src/TagRva2.cxx b/src/tag/TagRva2.cxx similarity index 100% rename from src/TagRva2.cxx rename to src/tag/TagRva2.cxx diff --git a/src/TagRva2.hxx b/src/tag/TagRva2.hxx similarity index 100% rename from src/TagRva2.hxx rename to src/tag/TagRva2.hxx diff --git a/src/aiff.c b/src/tag/aiff.c similarity index 100% rename from src/aiff.c rename to src/tag/aiff.c diff --git a/src/aiff.h b/src/tag/aiff.h similarity index 100% rename from src/aiff.h rename to src/tag/aiff.h diff --git a/src/riff.c b/src/tag/riff.c similarity index 100% rename from src/riff.c rename to src/tag/riff.c diff --git a/src/riff.h b/src/tag/riff.h similarity index 100% rename from src/riff.h rename to src/tag/riff.h diff --git a/test/dump_rva2.cxx b/test/dump_rva2.cxx index 95a55eb43..2bc8e0a85 100644 --- a/test/dump_rva2.cxx +++ b/test/dump_rva2.cxx @@ -18,8 +18,8 @@ */ #include "config.h" -#include "TagId3.hxx" -#include "TagRva2.hxx" +#include "tag/TagId3.hxx" +#include "tag/TagRva2.hxx" #include "replay_gain_info.h" #include "conf.h" #include "Tag.hxx" diff --git a/test/read_tags.cxx b/test/read_tags.cxx index 8e45be930..7a3cd15d7 100644 --- a/test/read_tags.cxx +++ b/test/read_tags.cxx @@ -25,8 +25,8 @@ #include "InputStream.hxx" #include "AudioFormat.hxx" #include "TagHandler.hxx" -#include "TagId3.hxx" -#include "ApeTag.hxx" +#include "tag/TagId3.hxx" +#include "tag/ApeTag.hxx" #include "util/Error.hxx" #include