settings: move log code to settings

src/citra/emu_window/emu_window_sdl2.cpp

@@ -136,6 +136,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
     SDL_GL_SetSwapInterval(Settings::values.use_vsync);
     LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
              Common::g_scm_desc);
+    Settings::LogSettings();
 
     DoneCurrent();
 }

src/citra_qt/configuration/config.cpp

@@ -461,10 +461,6 @@ void Config::SaveValues() {
     qt_config->endGroup();
 }
 
-void Config::LogSetting(const QString& name, const QVariant& value) {
-    LOG_INFO(Config, "{}: {}", name.toStdString(), value.toString().toStdString());
-}
-
 void Config::Reload() {
     ReadValues();
     Settings::Apply();
@@ -474,48 +470,6 @@ void Config::Save() {
     SaveValues();
 }
 
-void Config::LogSettings() {
-    LOG_INFO(Config, "Citra Configuration:");
-    LogSetting("Core_UseCpuJit", Settings::values.use_cpu_jit);
-    LogSetting("Renderer_UseHwRenderer", Settings::values.use_hw_renderer);
-    LogSetting("Renderer_UseHwShader", Settings::values.use_hw_shader);
-    LogSetting("Renderer_ShadersAccurateGs", Settings::values.shaders_accurate_gs);
-    LogSetting("Renderer_ShadersAccurateMul", Settings::values.shaders_accurate_mul);
-    LogSetting("Renderer_UseShaderJit", Settings::values.use_shader_jit);
-    LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor);
-    LogSetting("Renderer_UseVsync", Settings::values.use_vsync);
-    LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit);
-    LogSetting("Renderer_FrameLimit", Settings::values.frame_limit);
-    LogSetting("Layout_Toggle3d", Settings::values.toggle_3d);
-    LogSetting("Layout_Factor3d", Settings::values.factor_3d);
-    LogSetting("Layout_LayoutOption", static_cast<int>(Settings::values.layout_option));
-    LogSetting("Layout_SwapScreen", Settings::values.swap_screen);
-    LogSetting("Audio_OutputEngine", QString::fromStdString(Settings::values.sink_id));
-    LogSetting("Audio_EnableAudioStretching", Settings::values.enable_audio_stretching);
-    LogSetting("Audio_OutputDevice", QString::fromStdString(Settings::values.audio_device_id));
-    using namespace Service::CAM;
-    LogSetting("Camera_OuterRightName",
-               QString::fromStdString(Settings::values.camera_name[OuterRightCamera]));
-    LogSetting("Camera_OuterRightConfig",
-               QString::fromStdString(Settings::values.camera_config[OuterRightCamera]));
-    LogSetting("Camera_OuterRightFlip", Settings::values.camera_flip[OuterRightCamera]);
-    LogSetting("Camera_InnerName",
-               QString::fromStdString(Settings::values.camera_name[InnerCamera]));
-    LogSetting("Camera_InnerConfig",
-               QString::fromStdString(Settings::values.camera_config[InnerCamera]));
-    LogSetting("Camera_InnerFlip", Settings::values.camera_flip[InnerCamera]);
-    LogSetting("Camera_OuterLeftName",
-               QString::fromStdString(Settings::values.camera_name[OuterLeftCamera]));
-    LogSetting("Camera_OuterLeftConfig",
-               QString::fromStdString(Settings::values.camera_config[OuterLeftCamera]));
-    LogSetting("Camera_OuterLeftFlip", Settings::values.camera_flip[OuterLeftCamera]);
-    LogSetting("DataStorage_UseVirtualSd", Settings::values.use_virtual_sd);
-    LogSetting("System_IsNew3ds", Settings::values.is_new_3ds);
-    LogSetting("System_RegionValue", Settings::values.region_value);
-    LogSetting("Debugging_UseGdbstub", Settings::values.use_gdbstub);
-    LogSetting("Debugging_GdbstubPort", Settings::values.gdbstub_port);
-}
-
 Config::~Config() {
     Save();
 

src/citra_qt/configuration/config.h

@@ -17,7 +17,6 @@ class Config {
 
     void ReadValues();
     void SaveValues();
-    static void LogSetting(const QString& name, const QVariant& value);
 
 public:
     Config();
@@ -25,7 +24,6 @@ public:
 
     void Reload();
     void Save();
-    static void LogSettings();
 
     static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
     static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs;

src/citra_qt/configuration/configure_dialog.cpp

@@ -28,7 +28,7 @@ void ConfigureDialog::applyConfiguration() {
     ui->debugTab->applyConfiguration();
     ui->webTab->applyConfiguration();
     Settings::Apply();
-    Config::LogSettings();
+    Settings::LogSettings();
 }
 
 void ConfigureDialog::onLanguageChanged(const QString& locale) {

src/citra_qt/main.cpp

@@ -139,7 +139,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
     SetupUIStrings();
     LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
              Common::g_scm_desc);
-    Config::LogSettings();
 
     show();
 
@@ -1463,6 +1462,7 @@ int main(int argc, char* argv[]) {
     FileUtil::CreateFullPath(FileUtil::GetUserPath(D_LOGS_IDX));
     Log::AddBackend(
         std::make_unique<Log::FileBackend>(FileUtil::GetUserPath(D_LOGS_IDX) + LOG_FILE));
+    Settings::LogSettings();
 
     // Register CameraFactory
     Camera::RegisterFactory("image", std::make_unique<Camera::StillImageCameraFactory>());

src/core/settings.cpp

@@ -41,4 +41,45 @@ void Apply() {
     Service::CAM::ReloadCameraDevices();
 }
 
+template <typename T>
+void LogSetting(const std::string& name, const T& value) {
+    LOG_INFO(Config, "{}: {}", name, value);
+}
+
+void LogSettings() {
+    LOG_INFO(Config, "Citra Configuration:");
+    LogSetting("Core_UseCpuJit", Settings::values.use_cpu_jit);
+    LogSetting("Renderer_UseHwRenderer", Settings::values.use_hw_renderer);
+    LogSetting("Renderer_UseHwShader", Settings::values.use_hw_shader);
+    LogSetting("Renderer_ShadersAccurateGs", Settings::values.shaders_accurate_gs);
+    LogSetting("Renderer_ShadersAccurateMul", Settings::values.shaders_accurate_mul);
+    LogSetting("Renderer_UseShaderJit", Settings::values.use_shader_jit);
+    LogSetting("Renderer_UseResolutionFactor", Settings::values.resolution_factor);
+    LogSetting("Renderer_UseVsync", Settings::values.use_vsync);
+    LogSetting("Renderer_UseFrameLimit", Settings::values.use_frame_limit);
+    LogSetting("Renderer_FrameLimit", Settings::values.frame_limit);
+    LogSetting("Layout_Toggle3d", Settings::values.toggle_3d);
+    LogSetting("Layout_Factor3d", Settings::values.factor_3d);
+    LogSetting("Layout_LayoutOption", static_cast<int>(Settings::values.layout_option));
+    LogSetting("Layout_SwapScreen", Settings::values.swap_screen);
+    LogSetting("Audio_OutputEngine", Settings::values.sink_id);
+    LogSetting("Audio_EnableAudioStretching", Settings::values.enable_audio_stretching);
+    LogSetting("Audio_OutputDevice", Settings::values.audio_device_id);
+    using namespace Service::CAM;
+    LogSetting("Camera_OuterRightName", Settings::values.camera_name[OuterRightCamera]);
+    LogSetting("Camera_OuterRightConfig", Settings::values.camera_config[OuterRightCamera]);
+    LogSetting("Camera_OuterRightFlip", Settings::values.camera_flip[OuterRightCamera]);
+    LogSetting("Camera_InnerName", Settings::values.camera_name[InnerCamera]);
+    LogSetting("Camera_InnerConfig", Settings::values.camera_config[InnerCamera]);
+    LogSetting("Camera_InnerFlip", Settings::values.camera_flip[InnerCamera]);
+    LogSetting("Camera_OuterLeftName", Settings::values.camera_name[OuterLeftCamera]);
+    LogSetting("Camera_OuterLeftConfig", Settings::values.camera_config[OuterLeftCamera]);
+    LogSetting("Camera_OuterLeftFlip", Settings::values.camera_flip[OuterLeftCamera]);
+    LogSetting("DataStorage_UseVirtualSd", Settings::values.use_virtual_sd);
+    LogSetting("System_IsNew3ds", Settings::values.is_new_3ds);
+    LogSetting("System_RegionValue", Settings::values.region_value);
+    LogSetting("Debugging_UseGdbstub", Settings::values.use_gdbstub);
+    LogSetting("Debugging_GdbstubPort", Settings::values.gdbstub_port);
+}
+
 } // namespace Settings

src/core/settings.h

@@ -168,4 +168,5 @@ struct Values {
 static constexpr int REGION_VALUE_AUTO_SELECT = -1;
 
 void Apply();
+void LogSettings();
 } // namespace Settings