diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp index a165aa15..73c5bec6 100644 --- a/src/lms/ui/MediaPlayer.cpp +++ b/src/lms/ui/MediaPlayer.cpp @@ -108,16 +108,12 @@ namespace lms::ui return std::nullopt; } - std::optional bitrateFromString(const std::string& str) + std::optional bitrateFromInt(int bitRate) { - const auto value{ core::stringUtils::readAs(str) }; - if (!value) + if (!db::isAudioBitrateAllowed(bitRate)) return std::nullopt; - if (!db::isAudioBitrateAllowed(*value)) - return std::nullopt; - - return *value; + return bitRate; } std::optional replayGainModeFromString(const std::string& str) @@ -165,7 +161,7 @@ namespace lms::ui const Json::Object transcoding{ transcodingValue }; 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.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); } } {