From c6016856d878c8f68bc5518f3ef0270ea018bc3d Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Fri, 28 Dec 2018 18:35:55 -0500 Subject: settings: Add custom RTC settings Stored as signed seconds since epoch. --- src/yuzu/configuration/config.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/yuzu/configuration/config.cpp') diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 165d70e9c..6e034ef19 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -419,13 +419,20 @@ void Config::ReadValues() { Settings::values.language_index = qt_config->value("language_index", 1).toInt(); - const auto enabled = qt_config->value("rng_seed_enabled", false).toBool(); - if (enabled) { + const auto rng_seed_enabled = qt_config->value("rng_seed_enabled", false).toBool(); + if (rng_seed_enabled) { Settings::values.rng_seed = qt_config->value("rng_seed", 0).toULongLong(); } else { Settings::values.rng_seed = std::nullopt; } + const auto custom_rtc_enabled = qt_config->value("custom_rtc_enabled", false).toBool(); + if (custom_rtc_enabled) { + Settings::values.custom_rtc = qt_config->value("custom_rtc", 0).toULongLong(); + } else { + Settings::values.custom_rtc = std::nullopt; + } + qt_config->endGroup(); qt_config->beginGroup("Miscellaneous"); @@ -653,6 +660,9 @@ void Config::SaveValues() { qt_config->setValue("rng_seed_enabled", Settings::values.rng_seed.has_value()); qt_config->setValue("rng_seed", Settings::values.rng_seed.value_or(0)); + qt_config->setValue("custom_rtc_enabled", Settings::values.custom_rtc.has_value()); + qt_config->setValue("custom_rtc", Settings::values.custom_rtc.value_or(0)); + qt_config->endGroup(); qt_config->beginGroup("Miscellaneous"); -- cgit v1.2.3 From 05dbb47af51fb00826912155da85469cb74022db Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Fri, 28 Dec 2018 20:24:24 -0500 Subject: settings: Use std::chrono::seconds instead of s64 for RTC --- src/yuzu/configuration/config.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/yuzu/configuration/config.cpp') diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 6e034ef19..6c5284db5 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -428,7 +428,8 @@ void Config::ReadValues() { const auto custom_rtc_enabled = qt_config->value("custom_rtc_enabled", false).toBool(); if (custom_rtc_enabled) { - Settings::values.custom_rtc = qt_config->value("custom_rtc", 0).toULongLong(); + Settings::values.custom_rtc = + std::chrono::seconds(qt_config->value("custom_rtc", 0).toULongLong()); } else { Settings::values.custom_rtc = std::nullopt; } @@ -661,7 +662,8 @@ void Config::SaveValues() { qt_config->setValue("rng_seed", Settings::values.rng_seed.value_or(0)); qt_config->setValue("custom_rtc_enabled", Settings::values.custom_rtc.has_value()); - qt_config->setValue("custom_rtc", Settings::values.custom_rtc.value_or(0)); + qt_config->setValue("custom_rtc", + Settings::values.custom_rtc.value_or(std::chrono::seconds{}).count()); qt_config->endGroup(); -- cgit v1.2.3 From ac7d8983ebc75b1b5e150ea7e03ff54267faf670 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Mon, 7 Jan 2019 19:40:23 -0500 Subject: settings: Fix comment structure --- src/yuzu/configuration/config.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/yuzu/configuration/config.cpp') diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 6c5284db5..ddf4cf552 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -663,7 +663,8 @@ void Config::SaveValues() { qt_config->setValue("custom_rtc_enabled", Settings::values.custom_rtc.has_value()); qt_config->setValue("custom_rtc", - Settings::values.custom_rtc.value_or(std::chrono::seconds{}).count()); + QVariant::fromValue( + Settings::values.custom_rtc.value_or(std::chrono::seconds{}).count())); qt_config->endGroup(); -- cgit v1.2.3