From 22403272869228dce81e37523eda9da0c4305489 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 6 Dec 2021 09:24:12 +0100 Subject: [PATCH] ReplayGainInfo: move to tag/ --- meson.build | 1 - src/MusicChunk.hxx | 2 +- src/decoder/Bridge.hxx | 2 +- src/decoder/DecoderAPI.hxx | 2 +- src/decoder/plugins/FfmpegDecoderPlugin.cxx | 2 +- src/decoder/plugins/MadDecoderPlugin.cxx | 2 +- src/decoder/plugins/Mpg123DecoderPlugin.cxx | 2 +- src/decoder/plugins/OpusTags.cxx | 2 +- src/filter/plugins/ReplayGainFilterPlugin.cxx | 2 +- src/lib/xiph/FlacStreamMetadata.cxx | 4 ++-- src/lib/xiph/VorbisComments.cxx | 4 ++-- src/tag/ApeReplayGain.cxx | 2 +- src/tag/Id3ReplayGain.cxx | 2 +- src/{ => tag}/ReplayGainInfo.cxx | 0 src/{ => tag}/ReplayGainInfo.hxx | 0 src/tag/{ReplayGain.cxx => ReplayGainParser.cxx} | 2 +- src/tag/{ReplayGain.hxx => ReplayGainParser.hxx} | 0 src/tag/meson.build | 3 ++- test/dump_rva2.cxx | 2 +- 19 files changed, 18 insertions(+), 18 deletions(-) rename src/{ => tag}/ReplayGainInfo.cxx (100%) rename src/{ => tag}/ReplayGainInfo.hxx (100%) rename src/tag/{ReplayGain.cxx => ReplayGainParser.cxx} (98%) rename src/tag/{ReplayGain.hxx => ReplayGainParser.hxx} (100%) diff --git a/meson.build b/meson.build index 829dbcbe9..f7d82831e 100644 --- a/meson.build +++ b/meson.build @@ -463,7 +463,6 @@ endif basic = static_library( 'basic', - 'src/ReplayGainInfo.cxx', 'src/ReplayGainMode.cxx', 'src/SingleMode.cxx', include_directories: inc, diff --git a/src/MusicChunk.hxx b/src/MusicChunk.hxx index 21720fd6f..c1a4cf1fd 100644 --- a/src/MusicChunk.hxx +++ b/src/MusicChunk.hxx @@ -22,7 +22,7 @@ #include "MusicChunkPtr.hxx" #include "Chrono.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" #include "util/WritableBuffer.hxx" #ifndef NDEBUG diff --git a/src/decoder/Bridge.hxx b/src/decoder/Bridge.hxx index 6dbf71c9a..f29490793 100644 --- a/src/decoder/Bridge.hxx +++ b/src/decoder/Bridge.hxx @@ -21,7 +21,7 @@ #define MPD_DECODER_BRIDGE_HXX #include "Client.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" #include "MusicChunkPtr.hxx" #include diff --git a/src/decoder/DecoderAPI.hxx b/src/decoder/DecoderAPI.hxx index 871b28de1..f2f0bb277 100644 --- a/src/decoder/DecoderAPI.hxx +++ b/src/decoder/DecoderAPI.hxx @@ -33,7 +33,7 @@ #include "input/Ptr.hxx" #include "Command.hxx" #include "DecoderPlugin.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" #include "tag/Tag.hxx" #include "tag/MixRampInfo.hxx" #include "pcm/AudioFormat.hxx" diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index b7b4bc93d..03e6e0d76 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -37,7 +37,7 @@ #include "pcm/Interleave.hxx" #include "tag/Builder.hxx" #include "tag/Handler.hxx" -#include "tag/ReplayGain.hxx" +#include "tag/ReplayGainParser.hxx" #include "tag/MixRampParser.hxx" #include "input/InputStream.hxx" #include "pcm/CheckAudioFormat.hxx" diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index b76a93a29..3bb522d22 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -25,7 +25,7 @@ #include "tag/Id3ReplayGain.hxx" #include "tag/Id3MixRamp.hxx" #include "tag/Handler.hxx" -#include "tag/ReplayGain.hxx" +#include "tag/ReplayGainParser.hxx" #include "tag/MixRampParser.hxx" #include "pcm/CheckAudioFormat.hxx" #include "util/Clamp.hxx" diff --git a/src/decoder/plugins/Mpg123DecoderPlugin.cxx b/src/decoder/plugins/Mpg123DecoderPlugin.cxx index f346a0197..00bbef138 100644 --- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx +++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx @@ -22,7 +22,7 @@ #include "pcm/CheckAudioFormat.hxx" #include "tag/Handler.hxx" #include "tag/Builder.hxx" -#include "tag/ReplayGain.hxx" +#include "tag/ReplayGainParser.hxx" #include "tag/MixRampParser.hxx" #include "fs/Path.hxx" #include "util/Domain.hxx" diff --git a/src/decoder/plugins/OpusTags.cxx b/src/decoder/plugins/OpusTags.cxx index 74f2c0997..6afdc2379 100644 --- a/src/decoder/plugins/OpusTags.cxx +++ b/src/decoder/plugins/OpusTags.cxx @@ -24,7 +24,7 @@ #include "tag/Handler.hxx" #include "tag/ParseName.hxx" #include "util/ASCII.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" #include "util/NumberParser.hxx" #include "util/StringView.hxx" diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx index 7706be8ad..032cc23b7 100644 --- a/src/filter/plugins/ReplayGainFilterPlugin.cxx +++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx @@ -20,7 +20,7 @@ #include "ReplayGainFilterPlugin.hxx" #include "filter/Filter.hxx" #include "filter/Prepared.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" #include "config/ReplayGainConfig.hxx" #include "mixer/MixerControl.hxx" #include "pcm/AudioFormat.hxx" diff --git a/src/lib/xiph/FlacStreamMetadata.cxx b/src/lib/xiph/FlacStreamMetadata.cxx index e9a6d8d22..025719dc3 100644 --- a/src/lib/xiph/FlacStreamMetadata.cxx +++ b/src/lib/xiph/FlacStreamMetadata.cxx @@ -24,10 +24,10 @@ #include "tag/Handler.hxx" #include "tag/Builder.hxx" #include "tag/Tag.hxx" -#include "tag/ReplayGain.hxx" #include "tag/MixRampInfo.hxx" #include "tag/MixRampParser.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" +#include "tag/ReplayGainParser.hxx" #include "util/StringView.hxx" #include diff --git a/src/lib/xiph/VorbisComments.cxx b/src/lib/xiph/VorbisComments.cxx index 60416fe56..40899e145 100644 --- a/src/lib/xiph/VorbisComments.cxx +++ b/src/lib/xiph/VorbisComments.cxx @@ -24,8 +24,8 @@ #include "tag/Builder.hxx" #include "tag/Tag.hxx" #include "tag/VorbisComment.hxx" -#include "tag/ReplayGain.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" +#include "tag/ReplayGainParser.hxx" #include "util/StringView.hxx" #include "decoder/Features.h" diff --git a/src/tag/ApeReplayGain.cxx b/src/tag/ApeReplayGain.cxx index 8c8aece59..986f66e69 100644 --- a/src/tag/ApeReplayGain.cxx +++ b/src/tag/ApeReplayGain.cxx @@ -19,7 +19,7 @@ #include "ApeReplayGain.hxx" #include "ApeLoader.hxx" -#include "ReplayGain.hxx" +#include "ReplayGainParser.hxx" #include "util/StringView.hxx" #include diff --git a/src/tag/Id3ReplayGain.cxx b/src/tag/Id3ReplayGain.cxx index 1a41688ff..03d683e35 100644 --- a/src/tag/Id3ReplayGain.cxx +++ b/src/tag/Id3ReplayGain.cxx @@ -19,7 +19,7 @@ #include "Id3ReplayGain.hxx" #include "Rva2.hxx" -#include "ReplayGain.hxx" +#include "ReplayGainParser.hxx" #include "ReplayGainInfo.hxx" #include diff --git a/src/ReplayGainInfo.cxx b/src/tag/ReplayGainInfo.cxx similarity index 100% rename from src/ReplayGainInfo.cxx rename to src/tag/ReplayGainInfo.cxx diff --git a/src/ReplayGainInfo.hxx b/src/tag/ReplayGainInfo.hxx similarity index 100% rename from src/ReplayGainInfo.hxx rename to src/tag/ReplayGainInfo.hxx diff --git a/src/tag/ReplayGain.cxx b/src/tag/ReplayGainParser.cxx similarity index 98% rename from src/tag/ReplayGain.cxx rename to src/tag/ReplayGainParser.cxx index cf7f00046..8d162bb8d 100644 --- a/src/tag/ReplayGain.cxx +++ b/src/tag/ReplayGainParser.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "ReplayGain.hxx" +#include "ReplayGainParser.hxx" #include "VorbisComment.hxx" #include "ReplayGainInfo.hxx" #include "util/ASCII.hxx" diff --git a/src/tag/ReplayGain.hxx b/src/tag/ReplayGainParser.hxx similarity index 100% rename from src/tag/ReplayGain.hxx rename to src/tag/ReplayGainParser.hxx diff --git a/src/tag/meson.build b/src/tag/meson.build index b8d06826a..60e50cd36 100644 --- a/src/tag/meson.build +++ b/src/tag/meson.build @@ -27,7 +27,8 @@ tag_sources = [ 'Table.cxx', 'Format.cxx', 'VorbisComment.cxx', - 'ReplayGain.cxx', + 'ReplayGainInfo.cxx', + 'ReplayGainParser.cxx', 'MixRampParser.cxx', 'Generic.cxx', 'Id3MusicBrainz.cxx', diff --git a/test/dump_rva2.cxx b/test/dump_rva2.cxx index 6f7a2ca8a..cd6197af5 100644 --- a/test/dump_rva2.cxx +++ b/test/dump_rva2.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "tag/Id3Load.hxx" #include "tag/Rva2.hxx" -#include "ReplayGainInfo.hxx" +#include "tag/ReplayGainInfo.hxx" #include "thread/Mutex.hxx" #include "fs/Path.hxx" #include "input/InputStream.hxx"