summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-03-27 04:59:18 +0200
committerbunnei <bunneidev@gmail.com>2018-03-27 05:02:36 +0200
commit5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3 (patch)
treeeb7722cc9dee21ca3fe35df1187f3e2d41131448 /src
parentconfigure_general: Cleanup naming. (diff)
downloadyuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.gz
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.bz2
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.lz
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.xz
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.zst
yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/am/am.cpp10
-rw-r--r--src/core/settings.h2
-rw-r--r--src/yuzu/configuration/config.cpp4
-rw-r--r--src/yuzu/configuration/configure_general.cpp6
-rw-r--r--src/yuzu/configuration/configure_general.ui2
-rw-r--r--src/yuzu_cmd/config.cpp2
-rw-r--r--src/yuzu_cmd/default_ini.h2
7 files changed, 14 insertions, 14 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 07522e730..bab338205 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -242,20 +242,20 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) {
}
void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) {
- const bool is_docked{Settings::values.is_docked};
+ const bool use_docked_mode{Settings::values.use_docked_mode};
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
- rb.Push(static_cast<u8>(is_docked ? OperationMode::Docked : OperationMode::Handheld));
+ rb.Push(static_cast<u8>(use_docked_mode ? OperationMode::Docked : OperationMode::Handheld));
LOG_WARNING(Service_AM, "(STUBBED) called");
}
void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
- const bool is_docked{Settings::values.is_docked};
+ const bool use_docked_mode{Settings::values.use_docked_mode};
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
- rb.Push(static_cast<u32>(is_docked ? APM::PerformanceMode::Docked
- : APM::PerformanceMode::Handheld));
+ rb.Push(static_cast<u32>(use_docked_mode ? APM::PerformanceMode::Docked
+ : APM::PerformanceMode::Handheld));
LOG_WARNING(Service_AM, "(STUBBED) called");
}
diff --git a/src/core/settings.h b/src/core/settings.h
index 002d25dbd..eaef47236 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -112,7 +112,7 @@ enum class CpuCore {
struct Values {
// System
- bool is_docked;
+ bool use_docked_mode;
// Controls
std::array<std::string, NativeButton::NumButtons> buttons;
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 5842bebee..70035f388 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -95,7 +95,7 @@ void Config::ReadValues() {
qt_config->endGroup();
qt_config->beginGroup("System");
- Settings::values.is_docked = qt_config->value("is_docked", true).toBool();
+ Settings::values.use_docked_mode = qt_config->value("use_docked_mode", true).toBool();
qt_config->endGroup();
qt_config->beginGroup("Miscellaneous");
@@ -193,7 +193,7 @@ void Config::SaveValues() {
qt_config->endGroup();
qt_config->beginGroup("System");
- qt_config->setValue("is_docked", Settings::values.is_docked);
+ qt_config->setValue("use_docked_mode", Settings::values.use_docked_mode);
qt_config->endGroup();
qt_config->beginGroup("Miscellaneous");
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index e81161035..3ddb2f4b1 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -16,7 +16,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
this->setConfiguration();
ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn());
- ui->is_docked->setEnabled(!Core::System::GetInstance().IsPoweredOn());
+ ui->use_docked_mode->setEnabled(!Core::System::GetInstance().IsPoweredOn());
}
ConfigureGeneral::~ConfigureGeneral() {}
@@ -25,7 +25,7 @@ void ConfigureGeneral::setConfiguration() {
ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing);
ui->cpu_core_combobox->setCurrentIndex(static_cast<int>(Settings::values.cpu_core));
- ui->is_docked->setChecked(Settings::values.is_docked);
+ ui->use_docked_mode->setChecked(Settings::values.use_docked_mode);
}
void ConfigureGeneral::applyConfiguration() {
@@ -33,6 +33,6 @@ void ConfigureGeneral::applyConfiguration() {
UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked();
Settings::values.cpu_core =
static_cast<Settings::CpuCore>(ui->cpu_core_combobox->currentIndex());
- Settings::values.is_docked = ui->is_docked->isChecked();
+ Settings::values.use_docked_mode = ui->use_docked_mode->isChecked();
Settings::Apply();
}
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index b0684f0c1..717b1b474 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -79,7 +79,7 @@
<item>
<layout class="QVBoxLayout" name="EmulationVerticalLayout">
<item>
- <widget class="QCheckBox" name="is_docked">
+ <widget class="QCheckBox" name="use_docked_mode">
<property name="text">
<string>Enable docked mode</string>
</property>
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 38f76d425..b09e9fc0b 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -108,7 +108,7 @@ void Config::ReadValues() {
sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
// System
- Settings::values.is_docked = sdl2_config->GetBoolean("System", "is_docked", true);
+ Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", true);
// Miscellaneous
Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace");
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h
index 50802104c..c42aba6a4 100644
--- a/src/yuzu_cmd/default_ini.h
+++ b/src/yuzu_cmd/default_ini.h
@@ -156,7 +156,7 @@ use_virtual_sd =
[System]
# Whether the system is docked
# 1 (default): Yes, 0: No
-is_docked =
+use_docked_mode =
# The system region that Citra will use during emulation
# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan