owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fixed bitrate not properly parsed from html local storage, fixes #587

Browse Source
This commit is contained in:
emeric
2025-01-08 19:11:33 +01:00
parent dd163f04c8
commit 965c2af662
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms/ui/MediaPlayer.cpp
+4 -8
View File
@@ -108,16 +108,12 @@ namespace lms::ui
return std::nullopt; return std::nullopt;
} }
std::optional<MediaPlayer::Bitrate> bitrateFromString(const std::string& str) std::optional<MediaPlayer::Bitrate> bitrateFromInt(int bitRate)
{ {
const auto value{ core::stringUtils::readAs<int>(str) }; if (!db::isAudioBitrateAllowed(bitRate))
if (!value)
return std::nullopt; return std::nullopt;
if (!db::isAudioBitrateAllowed(*value)) return bitRate;
return std::nullopt;
return *value;
} }
std::optional<MediaPlayer::Settings::ReplayGain::Mode> replayGainModeFromString(const std::string& str) std::optional<MediaPlayer::Settings::ReplayGain::Mode> replayGainModeFromString(const std::string& str)
@@ -165,7 +161,7 @@ namespace lms::ui
const Json::Object transcoding{ transcodingValue }; const Json::Object transcoding{ transcodingValue };
settings.transcoding.mode = transcodingModeFromString(transcoding.get("mode").toString().orIfNull("")).value_or(Settings::Transcoding::defaultMode); settings.transcoding.mode = transcodingModeFromString(transcoding.get("mode").toString().orIfNull("")).value_or(Settings::Transcoding::defaultMode);
settings.transcoding.format = formatFromString(transcoding.get("format").toString().orIfNull("")).value_or(Settings::Transcoding::defaultFormat); settings.transcoding.format = formatFromString(transcoding.get("format").toString().orIfNull("")).value_or(Settings::Transcoding::defaultFormat);
settings.transcoding.bitrate = bitrateFromString(transcoding.get("bitrate").toString().orIfNull("")).value_or(Settings::Transcoding::defaultBitrate); settings.transcoding.bitrate = bitrateFromInt(transcoding.get("bitrate").toNumber().orIfNull(0)).value_or(Settings::Transcoding::defaultBitrate);
} }
} }
{ {