From a94a828b6c5c1a1631ef0c414da570e8c22bc3f5 Mon Sep 17 00:00:00 2001 From: zhupengfei Date: Tue, 10 Jul 2018 18:02:14 +0800 Subject: [PATCH] citra_qt: Log settings on launch --- src/core/settings.cpp | 29 +++++++++++++++++++++ src/core/settings.h | 1 + src/yuzu/configuration/configure_dialog.cpp | 1 + src/yuzu/main.cpp | 3 +++ src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 1 + 5 files changed, 35 insertions(+) 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() { Service::HID::ReloadInputDevices(); } +template +void LogSetting(const std::string& name, const T& value) { + LOG_INFO(Config, "{}: {}", name, value); +} + +void LogSettings() { + LOG_INFO(Config, "yuzu Configuration:"); + LogSetting("System_UseDockedMode", Settings::values.use_docked_mode); + LogSetting("System_EnableNfc", Settings::values.enable_nfc); + LogSetting("System_RngSeed", Settings::values.rng_seed.value_or(0)); + LogSetting("System_CurrentUser", Settings::values.current_user); + LogSetting("System_LanguageIndex", Settings::values.language_index); + LogSetting("Core_UseCpuJit", Settings::values.use_cpu_jit); + LogSetting("Core_UseMultiCore", Settings::values.use_multi_core); + LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor); + LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit); + LogSetting("Renderer_FrameLimit", Settings::values.frame_limit); + LogSetting("Renderer_UseAccurateGpuEmulation", Settings::values.use_accurate_gpu_emulation); + LogSetting("Audio_OutputEngine", Settings::values.sink_id); + LogSetting("Audio_EnableAudioStretching", Settings::values.enable_audio_stretching); + LogSetting("Audio_OutputDevice", Settings::values.audio_device_id); + LogSetting("DataStorage_UseVirtualSd", Settings::values.use_virtual_sd); + LogSetting("DataStorage_NandDir", Settings::values.nand_dir); + LogSetting("DataStorage_SdmcDir", Settings::values.sdmc_dir); + LogSetting("Debugging_UseGdbstub", Settings::values.use_gdbstub); + LogSetting("Debugging_GdbstubPort", Settings::values.gdbstub_port); + LogSetting("Debugging_ProgramArgs", Settings::values.program_args); +} + } // 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 { } extern values; void Apply(); +void LogSettings(); } // 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() { ui->debugTab->applyConfiguration(); ui->webTab->applyConfiguration(); Settings::Apply(); + Settings::LogSettings(); } void 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[]) { GMainWindow main_window; // After settings have been loaded by GMainWindow, apply the filter main_window.show(); + + Settings::LogSettings(); + int result = app.exec(); detached_tasks.WaitForAllTasks(); 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) { SDL_GL_SetSwapInterval(false); LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); + Settings::LogSettings(); DoneCurrent(); }