oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/OpusTags: use ParseInteger()

Browse Source
This commit is contained in:
Max Kellermann 2024-01-04 21:04:15 +01:00
parent e1eea9d98a
commit 4086190c80
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/decoder/plugins/OpusTags.cxx
View File

@ -9,7 +9,7 @@
#include "tag/ParseName.hxx" #include "tag/ParseName.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "tag/ReplayGainInfo.hxx" #include "tag/ReplayGainInfo.hxx"
#include "util/CNumberParser.hxx" #include "util/NumberParser.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
#include "util/StringSplit.hxx" #include "util/StringSplit.hxx"
@ -46,19 +46,15 @@ ScanOneOpusTag(std::string_view name, std::string_view value,
/* R128_TRACK_GAIN is a Q7.8 fixed point number in /* R128_TRACK_GAIN is a Q7.8 fixed point number in
dB */ dB */
const char *endptr; if (const auto i = ParseInteger<int_least32_t>(value))
const auto l = ParseInt64(value, &endptr, 10); rgi->track.gain = float(*i) / 256.0f;
if (endptr > value.begin() && endptr == value.end())
rgi->track.gain = float(l) / 256.0f;
} else if (rgi != nullptr && } else if (rgi != nullptr &&
StringIsEqualIgnoreCase(name, "R128_ALBUM_GAIN"sv)) { StringIsEqualIgnoreCase(name, "R128_ALBUM_GAIN"sv)) {
/* R128_ALBUM_GAIN is a Q7.8 fixed point number in /* R128_ALBUM_GAIN is a Q7.8 fixed point number in
dB */ dB */
const char *endptr; if (const auto i = ParseInteger<int_least32_t>(value))
const auto l = ParseInt64(value, &endptr, 10); rgi->album.gain = float(*i) / 256.0f;
if (endptr > value.begin() && endptr == value.end())
rgi->album.gain = float(l) / 256.0f;
} }
handler.OnPair(name, value); handler.OnPair(name, value);