summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2019-01-23 20:46:37 -0500
committerGravatar GitHub2019-01-23 20:46:37 -0500
commit9be3fedcaa9f792db93143e60f8b6f4bd02e43f1 (patch)
tree07e6f58a85f042fdb5613b0a7ea805ccc75e7e0b /src
parentMerge pull request #2047 from FearlessTobi/patch-3 (diff)
parentcitra_qt: Log settings on launch (diff)
downloadyuzu-9be3fedcaa9f792db93143e60f8b6f4bd02e43f1.tar.gz
yuzu-9be3fedcaa9f792db93143e60f8b6f4bd02e43f1.tar.xz
yuzu-9be3fedcaa9f792db93143e60f8b6f4bd02e43f1.zip
Merge pull request #2049 from FearlessTobi/port-3928
Port citra-emu/citra#3928: "citra_qt: Log settings on launch"
Diffstat (limited to 'src')
-rw-r--r--src/core/settings.cpp29
-rw-r--r--src/core/settings.h1
-rw-r--r--src/yuzu/configuration/configure_dialog.cpp1
-rw-r--r--src/yuzu/main.cpp3
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp1
5 files changed, 35 insertions, 0 deletions
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index 26fcd3405..2e232e1e7 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -74,4 +74,33 @@ void Apply() {
74 Service::HID::ReloadInputDevices(); 74 Service::HID::ReloadInputDevices();
75} 75}
76 76
77template <typename T>
78void LogSetting(const std::string& name, const T& value) {
79 LOG_INFO(Config, "{}: {}", name, value);
80}
81
82void LogSettings() {
83 LOG_INFO(Config, "yuzu Configuration:");
84 LogSetting("System_UseDockedMode", Settings::values.use_docked_mode);
85 LogSetting("System_EnableNfc", Settings::values.enable_nfc);
86 LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0));
87 LogSetting("System_CurrentUser", Settings::values.current_user);
88 LogSetting("System_LanguageIndex", Settings::values.language_index);
89 LogSetting("Core_UseCpuJit", Settings::values.use_cpu_jit);
90 LogSetting("Core_UseMultiCore", Settings::values.use_multi_core);
91 LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor);
92 LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit);
93 LogSetting("Renderer_FrameLimit", Settings::values.frame_limit);
94 LogSetting("Renderer_UseAccurateGpuEmulation", Settings::values.use_accurate_gpu_emulation);
95 LogSetting("Audio_OutputEngine", Settings::values.sink_id);
96 LogSetting("Audio_EnableAudioStretching", Settings::values.enable_audio_stretching);
97 LogSetting("Audio_OutputDevice", Settings::values.audio_device_id);
98 LogSetting("DataStorage_UseVirtualSd", Settings::values.use_virtual_sd);
99 LogSetting("DataStorage_NandDir", Settings::values.nand_dir);
100 LogSetting("DataStorage_SdmcDir", Settings::values.sdmc_dir);
101 LogSetting("Debugging_UseGdbstub", Settings::values.use_gdbstub);
102 LogSetting("Debugging_GdbstubPort", Settings::values.gdbstub_port);
103 LogSetting("Debugging_ProgramArgs", Settings::values.program_args);
104}
105
77} // namespace Settings 106} // namespace Settings
diff --git a/src/core/settings.h b/src/core/settings.h
index 29ce98983..c97387fc7 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -425,4 +425,5 @@ struct Values {
425} extern values; 425} extern values;
426 426
427void Apply(); 427void Apply();
428void LogSettings();
428} // namespace Settings 429} // namespace Settings
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index d802443d0..777050405 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -39,6 +39,7 @@ void ConfigureDialog::applyConfiguration() {
39 ui->debugTab->applyConfiguration(); 39 ui->debugTab->applyConfiguration();
40 ui->webTab->applyConfiguration(); 40 ui->webTab->applyConfiguration();
41 Settings::Apply(); 41 Settings::Apply();
42 Settings::LogSettings();
42} 43}
43 44
44void ConfigureDialog::PopulateSelectionList() { 45void ConfigureDialog::PopulateSelectionList() {
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 2c3e27c2e..ca6ddebcb 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -2042,6 +2042,9 @@ int main(int argc, char* argv[]) {
2042 GMainWindow main_window; 2042 GMainWindow main_window;
2043 // After settings have been loaded by GMainWindow, apply the filter 2043 // After settings have been loaded by GMainWindow, apply the filter
2044 main_window.show(); 2044 main_window.show();
2045
2046 Settings::LogSettings();
2047
2045 int result = app.exec(); 2048 int result = app.exec();
2046 detached_tasks.WaitForAllTasks(); 2049 detached_tasks.WaitForAllTasks();
2047 return result; 2050 return result;
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index a557f2884..7df8eff53 100644
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -195,6 +195,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
195 SDL_GL_SetSwapInterval(false); 195 SDL_GL_SetSwapInterval(false);
196 LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, 196 LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
197 Common::g_scm_desc); 197 Common::g_scm_desc);
198 Settings::LogSettings();
198 199
199 DoneCurrent(); 200 DoneCurrent();
200} 201}