diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index c44addeea..b7b4bc93d 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -38,7 +38,7 @@ #include "tag/Builder.hxx" #include "tag/Handler.hxx" #include "tag/ReplayGain.hxx" -#include "tag/MixRamp.hxx" +#include "tag/MixRampParser.hxx" #include "input/InputStream.hxx" #include "pcm/CheckAudioFormat.hxx" #include "util/ScopeExit.hxx" diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index 98d48e2a6..fe68810b3 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -25,7 +25,7 @@ #include "tag/Id3ReplayGain.hxx" #include "tag/Handler.hxx" #include "tag/ReplayGain.hxx" -#include "tag/MixRamp.hxx" +#include "tag/MixRampParser.hxx" #include "pcm/CheckAudioFormat.hxx" #include "util/Clamp.hxx" #include "util/StringCompare.hxx" diff --git a/src/decoder/plugins/Mpg123DecoderPlugin.cxx b/src/decoder/plugins/Mpg123DecoderPlugin.cxx index bffa25be1..f346a0197 100644 --- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx +++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx @@ -23,7 +23,7 @@ #include "tag/Handler.hxx" #include "tag/Builder.hxx" #include "tag/ReplayGain.hxx" -#include "tag/MixRamp.hxx" +#include "tag/MixRampParser.hxx" #include "fs/Path.hxx" #include "util/Domain.hxx" #include "util/ScopeExit.hxx" diff --git a/src/lib/xiph/FlacStreamMetadata.cxx b/src/lib/xiph/FlacStreamMetadata.cxx index 36eb21191..bdb8f11bb 100644 --- a/src/lib/xiph/FlacStreamMetadata.cxx +++ b/src/lib/xiph/FlacStreamMetadata.cxx @@ -26,7 +26,7 @@ #include "tag/Builder.hxx" #include "tag/Tag.hxx" #include "tag/ReplayGain.hxx" -#include "tag/MixRamp.hxx" +#include "tag/MixRampParser.hxx" #include "ReplayGainInfo.hxx" #include "util/StringView.hxx" diff --git a/src/tag/MixRamp.cxx b/src/tag/MixRampParser.cxx similarity index 98% rename from src/tag/MixRamp.cxx rename to src/tag/MixRampParser.cxx index 6af84931f..d1cf8cd57 100644 --- a/src/tag/MixRamp.cxx +++ b/src/tag/MixRampParser.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "MixRamp.hxx" +#include "MixRampParser.hxx" #include "VorbisComment.hxx" #include "MixRampInfo.hxx" #include "util/ASCII.hxx" diff --git a/src/tag/MixRamp.hxx b/src/tag/MixRampParser.hxx similarity index 94% rename from src/tag/MixRamp.hxx rename to src/tag/MixRampParser.hxx index c86b42e20..50a47d3aa 100644 --- a/src/tag/MixRamp.hxx +++ b/src/tag/MixRampParser.hxx @@ -17,8 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_TAG_MIXRAMP_HXX -#define MPD_TAG_MIXRAMP_HXX +#pragma once struct StringView; class MixRampInfo; @@ -29,5 +28,3 @@ ParseMixRampTag(MixRampInfo &info, bool ParseMixRampVorbis(MixRampInfo &info, StringView entry) noexcept; - -#endif diff --git a/src/tag/meson.build b/src/tag/meson.build index aa8309583..0363608b2 100644 --- a/src/tag/meson.build +++ b/src/tag/meson.build @@ -28,7 +28,7 @@ tag_sources = [ 'Format.cxx', 'VorbisComment.cxx', 'ReplayGain.cxx', - 'MixRamp.cxx', + 'MixRampParser.cxx', 'Generic.cxx', 'Id3MusicBrainz.cxx', 'Id3Picture.cxx', diff --git a/test/tag/TestMixRampParser.cxx b/test/tag/TestMixRampParser.cxx index 4f79690cf..86464c7bd 100644 --- a/test/tag/TestMixRampParser.cxx +++ b/test/tag/TestMixRampParser.cxx @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "tag/MixRamp.hxx" +#include "tag/MixRampParser.cxx" #include "util/StringView.hxx" #include "MixRampInfo.hxx"