settings: move log code to settings
This commit is contained in:
parent
82aa45d9fa
commit
e8ac58c480
|
@ -136,6 +136,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) {
|
||||||
SDL_GL_SetSwapInterval(Settings::values.use_vsync);
|
SDL_GL_SetSwapInterval(Settings::values.use_vsync);
|
||||||
LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||||
Common::g_scm_desc);
|
Common::g_scm_desc);
|
||||||
|
Settings::LogSettings();
|
||||||
|
|
||||||
DoneCurrent();
|
DoneCurrent();
|
||||||
}
|
}
|
||||||
|
|
|
@ -461,10 +461,6 @@ void Config::SaveValues() {
|
||||||
qt_config->endGroup();
|
qt_config->endGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Config::LogSetting(const QString& name, const QVariant& value) {
|
|
||||||
LOG_INFO(Config, "{}: {}", name.toStdString(), value.toString().toStdString());
|
|
||||||
}
|
|
||||||
|
|
||||||
void Config::Reload() {
|
void Config::Reload() {
|
||||||
ReadValues();
|
ReadValues();
|
||||||
Settings::Apply();
|
Settings::Apply();
|
||||||
|
@ -474,48 +470,6 @@ void Config::Save() {
|
||||||
SaveValues();
|
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() {
|
Config::~Config() {
|
||||||
Save();
|
Save();
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@ class Config {
|
||||||
|
|
||||||
void ReadValues();
|
void ReadValues();
|
||||||
void SaveValues();
|
void SaveValues();
|
||||||
static void LogSetting(const QString& name, const QVariant& value);
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Config();
|
Config();
|
||||||
|
@ -25,7 +24,6 @@ public:
|
||||||
|
|
||||||
void Reload();
|
void Reload();
|
||||||
void Save();
|
void Save();
|
||||||
static void LogSettings();
|
|
||||||
|
|
||||||
static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
|
static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
|
||||||
static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs;
|
static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs;
|
||||||
|
|
|
@ -28,7 +28,7 @@ void ConfigureDialog::applyConfiguration() {
|
||||||
ui->debugTab->applyConfiguration();
|
ui->debugTab->applyConfiguration();
|
||||||
ui->webTab->applyConfiguration();
|
ui->webTab->applyConfiguration();
|
||||||
Settings::Apply();
|
Settings::Apply();
|
||||||
Config::LogSettings();
|
Settings::LogSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfigureDialog::onLanguageChanged(const QString& locale) {
|
void ConfigureDialog::onLanguageChanged(const QString& locale) {
|
||||||
|
|
|
@ -139,7 +139,6 @@ GMainWindow::GMainWindow() : config(new Config()), emu_thread(nullptr) {
|
||||||
SetupUIStrings();
|
SetupUIStrings();
|
||||||
LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch,
|
||||||
Common::g_scm_desc);
|
Common::g_scm_desc);
|
||||||
Config::LogSettings();
|
|
||||||
|
|
||||||
show();
|
show();
|
||||||
|
|
||||||
|
@ -1463,6 +1462,7 @@ int main(int argc, char* argv[]) {
|
||||||
FileUtil::CreateFullPath(FileUtil::GetUserPath(D_LOGS_IDX));
|
FileUtil::CreateFullPath(FileUtil::GetUserPath(D_LOGS_IDX));
|
||||||
Log::AddBackend(
|
Log::AddBackend(
|
||||||
std::make_unique<Log::FileBackend>(FileUtil::GetUserPath(D_LOGS_IDX) + LOG_FILE));
|
std::make_unique<Log::FileBackend>(FileUtil::GetUserPath(D_LOGS_IDX) + LOG_FILE));
|
||||||
|
Settings::LogSettings();
|
||||||
|
|
||||||
// Register CameraFactory
|
// Register CameraFactory
|
||||||
Camera::RegisterFactory("image", std::make_unique<Camera::StillImageCameraFactory>());
|
Camera::RegisterFactory("image", std::make_unique<Camera::StillImageCameraFactory>());
|
||||||
|
|
|
@ -41,4 +41,45 @@ void Apply() {
|
||||||
Service::CAM::ReloadCameraDevices();
|
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
|
} // namespace Settings
|
||||||
|
|
|
@ -168,4 +168,5 @@ struct Values {
|
||||||
static constexpr int REGION_VALUE_AUTO_SELECT = -1;
|
static constexpr int REGION_VALUE_AUTO_SELECT = -1;
|
||||||
|
|
||||||
void Apply();
|
void Apply();
|
||||||
|
void LogSettings();
|
||||||
} // namespace Settings
|
} // namespace Settings
|
||||||
|
|
Reference in New Issue