Просмотр исходного кода

core, input_common: Miscellaneous fixes

bcat: Fix settings access

telemetry_session: Fix settings accesses

So this is what I get for testing with the web service disabled.

touch_from_button: Fix settings access for clang
lat9nq 5 лет назад
Родитель
Сommit
0e5c74bc9e

+ 1 - 1
src/core/hle/service/bcat/module.cpp

@@ -579,7 +579,7 @@ void Module::Interface::CreateDeliveryCacheStorageServiceWithApplicationId(
 std::unique_ptr<Backend> CreateBackendFromSettings([[maybe_unused]] Core::System& system,
 std::unique_ptr<Backend> CreateBackendFromSettings([[maybe_unused]] Core::System& system,
                                                    DirectoryGetter getter) {
                                                    DirectoryGetter getter) {
 #ifdef YUZU_ENABLE_BOXCAT
 #ifdef YUZU_ENABLE_BOXCAT
-    if (Settings::values.bcat_backend == "boxcat") {
+    if (Settings::values.bcat_backend.GetValue() == "boxcat") {
         return std::make_unique<Boxcat>(system.GetAppletManager(), std::move(getter));
         return std::make_unique<Boxcat>(system.GetAppletManager(), std::move(getter));
     }
     }
 #endif
 #endif

+ 5 - 3
src/core/telemetry_session.cpp

@@ -135,7 +135,7 @@ u64 RegenerateTelemetryId() {
 
 
 bool VerifyLogin(const std::string& username, const std::string& token) {
 bool VerifyLogin(const std::string& username, const std::string& token) {
 #ifdef ENABLE_WEB_SERVICE
 #ifdef ENABLE_WEB_SERVICE
-    return WebService::VerifyLogin(Settings::values.web_api_url, username, token);
+    return WebService::VerifyLogin(Settings::values.web_api_url.GetValue(), username, token);
 #else
 #else
     return false;
     return false;
 #endif
 #endif
@@ -152,7 +152,8 @@ TelemetrySession::~TelemetrySession() {
 
 
 #ifdef ENABLE_WEB_SERVICE
 #ifdef ENABLE_WEB_SERVICE
     auto backend = std::make_unique<WebService::TelemetryJson>(
     auto backend = std::make_unique<WebService::TelemetryJson>(
-        Settings::values.web_api_url, Settings::values.yuzu_username, Settings::values.yuzu_token);
+        Settings::values.web_api_url.GetValue(), Settings::values.yuzu_username.GetValue(),
+        Settings::values.yuzu_token.GetValue());
 #else
 #else
     auto backend = std::make_unique<Telemetry::NullVisitor>();
     auto backend = std::make_unique<Telemetry::NullVisitor>();
 #endif
 #endif
@@ -242,7 +243,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader,
 bool TelemetrySession::SubmitTestcase() {
 bool TelemetrySession::SubmitTestcase() {
 #ifdef ENABLE_WEB_SERVICE
 #ifdef ENABLE_WEB_SERVICE
     auto backend = std::make_unique<WebService::TelemetryJson>(
     auto backend = std::make_unique<WebService::TelemetryJson>(
-        Settings::values.web_api_url, Settings::values.yuzu_username, Settings::values.yuzu_token);
+        Settings::values.web_api_url.GetValue(), Settings::values.yuzu_username.GetValue(),
+        Settings::values.yuzu_token.GetValue());
     field_collection.Accept(*backend);
     field_collection.Accept(*backend);
     return backend->SubmitTestcase();
     return backend->SubmitTestcase();
 #else
 #else

+ 2 - 1
src/input_common/touch_from_button.cpp

@@ -12,7 +12,8 @@ namespace InputCommon {
 class TouchFromButtonDevice final : public Input::TouchDevice {
 class TouchFromButtonDevice final : public Input::TouchDevice {
 public:
 public:
     TouchFromButtonDevice() {
     TouchFromButtonDevice() {
-        const auto button_index = Settings::values.touch_from_button_map_index.GetValue();
+        const auto button_index =
+            static_cast<u64>(Settings::values.touch_from_button_map_index.GetValue());
         const auto& buttons = Settings::values.touch_from_button_maps[button_index].buttons;
         const auto& buttons = Settings::values.touch_from_button_maps[button_index].buttons;
 
 
         for (const auto& config_entry : buttons) {
         for (const auto& config_entry : buttons) {