diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/fs/fs_paths.h | 1 | ||||
| -rw-r--r-- | src/common/fs/path_util.cpp | 1 | ||||
| -rw-r--r-- | src/common/fs/path_util.h | 1 | ||||
| -rw-r--r-- | src/common/settings.cpp | 5 | ||||
| -rw-r--r-- | src/common/settings.h | 12 |
5 files changed, 14 insertions, 6 deletions
diff --git a/src/common/fs/fs_paths.h b/src/common/fs/fs_paths.h index b32614797..5d447f108 100644 --- a/src/common/fs/fs_paths.h +++ b/src/common/fs/fs_paths.h | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #define SCREENSHOTS_DIR "screenshots" | 21 | #define SCREENSHOTS_DIR "screenshots" |
| 22 | #define SDMC_DIR "sdmc" | 22 | #define SDMC_DIR "sdmc" |
| 23 | #define SHADER_DIR "shader" | 23 | #define SHADER_DIR "shader" |
| 24 | #define TAS_DIR "tas" | ||
| 24 | 25 | ||
| 25 | // yuzu-specific files | 26 | // yuzu-specific files |
| 26 | 27 | ||
diff --git a/src/common/fs/path_util.cpp b/src/common/fs/path_util.cpp index 6cdd14f13..43b79bd6d 100644 --- a/src/common/fs/path_util.cpp +++ b/src/common/fs/path_util.cpp | |||
| @@ -116,6 +116,7 @@ private: | |||
| 116 | GenerateYuzuPath(YuzuPath::ScreenshotsDir, yuzu_path / SCREENSHOTS_DIR); | 116 | GenerateYuzuPath(YuzuPath::ScreenshotsDir, yuzu_path / SCREENSHOTS_DIR); |
| 117 | GenerateYuzuPath(YuzuPath::SDMCDir, yuzu_path / SDMC_DIR); | 117 | GenerateYuzuPath(YuzuPath::SDMCDir, yuzu_path / SDMC_DIR); |
| 118 | GenerateYuzuPath(YuzuPath::ShaderDir, yuzu_path / SHADER_DIR); | 118 | GenerateYuzuPath(YuzuPath::ShaderDir, yuzu_path / SHADER_DIR); |
| 119 | GenerateYuzuPath(YuzuPath::TASDir, yuzu_path / TAS_DIR); | ||
| 119 | } | 120 | } |
| 120 | 121 | ||
| 121 | ~PathManagerImpl() = default; | 122 | ~PathManagerImpl() = default; |
diff --git a/src/common/fs/path_util.h b/src/common/fs/path_util.h index f956ac9a2..0a9e3a145 100644 --- a/src/common/fs/path_util.h +++ b/src/common/fs/path_util.h | |||
| @@ -23,6 +23,7 @@ enum class YuzuPath { | |||
| 23 | ScreenshotsDir, // Where yuzu screenshots are stored. | 23 | ScreenshotsDir, // Where yuzu screenshots are stored. |
| 24 | SDMCDir, // Where the emulated SDMC is stored. | 24 | SDMCDir, // Where the emulated SDMC is stored. |
| 25 | ShaderDir, // Where shaders are stored. | 25 | ShaderDir, // Where shaders are stored. |
| 26 | TASDir, // Where TAS scripts are stored. | ||
| 26 | }; | 27 | }; |
| 27 | 28 | ||
| 28 | /** | 29 | /** |
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 0d2df80a8..69f0bd8c0 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -61,7 +61,6 @@ void LogSettings() { | |||
| 61 | log_setting("Renderer_UseAsynchronousShaders", values.use_asynchronous_shaders.GetValue()); | 61 | log_setting("Renderer_UseAsynchronousShaders", values.use_asynchronous_shaders.GetValue()); |
| 62 | log_setting("Renderer_AnisotropicFilteringLevel", values.max_anisotropy.GetValue()); | 62 | log_setting("Renderer_AnisotropicFilteringLevel", values.max_anisotropy.GetValue()); |
| 63 | log_setting("Audio_OutputEngine", values.sink_id.GetValue()); | 63 | log_setting("Audio_OutputEngine", values.sink_id.GetValue()); |
| 64 | log_setting("Audio_EnableAudioStretching", values.enable_audio_stretching.GetValue()); | ||
| 65 | log_setting("Audio_OutputDevice", values.audio_device_id.GetValue()); | 64 | log_setting("Audio_OutputDevice", values.audio_device_id.GetValue()); |
| 66 | log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd.GetValue()); | 65 | log_setting("DataStorage_UseVirtualSd", values.use_virtual_sd.GetValue()); |
| 67 | log_path("DataStorage_CacheDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir)); | 66 | log_path("DataStorage_CacheDir", Common::FS::GetYuzuPath(Common::FS::YuzuPath::CacheDir)); |
| @@ -72,6 +71,9 @@ void LogSettings() { | |||
| 72 | log_setting("Debugging_ProgramArgs", values.program_args.GetValue()); | 71 | log_setting("Debugging_ProgramArgs", values.program_args.GetValue()); |
| 73 | log_setting("Services_BCATBackend", values.bcat_backend.GetValue()); | 72 | log_setting("Services_BCATBackend", values.bcat_backend.GetValue()); |
| 74 | log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local.GetValue()); | 73 | log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local.GetValue()); |
| 74 | log_setting("Input_EnableMotion", values.motion_enabled.GetValue()); | ||
| 75 | log_setting("Input_EnableVibration", values.vibration_enabled.GetValue()); | ||
| 76 | log_setting("Input_EnableRawInput", values.enable_raw_input.GetValue()); | ||
| 75 | } | 77 | } |
| 76 | 78 | ||
| 77 | bool IsConfiguringGlobal() { | 79 | bool IsConfiguringGlobal() { |
| @@ -112,7 +114,6 @@ void RestoreGlobalState(bool is_powered_on) { | |||
| 112 | } | 114 | } |
| 113 | 115 | ||
| 114 | // Audio | 116 | // Audio |
| 115 | values.enable_audio_stretching.SetGlobal(true); | ||
| 116 | values.volume.SetGlobal(true); | 117 | values.volume.SetGlobal(true); |
| 117 | 118 | ||
| 118 | // Core | 119 | // Core |
diff --git a/src/common/settings.h b/src/common/settings.h index b7195670b..c53d5acc3 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include "common/common_types.h" | 17 | #include "common/common_types.h" |
| 18 | #include "common/settings_input.h" | 18 | #include "common/settings_input.h" |
| 19 | #include "input_common/udp/client.h" | ||
| 20 | 19 | ||
| 21 | namespace Settings { | 20 | namespace Settings { |
| 22 | 21 | ||
| @@ -415,7 +414,6 @@ struct Values { | |||
| 415 | BasicSetting<std::string> audio_device_id{"auto", "output_device"}; | 414 | BasicSetting<std::string> audio_device_id{"auto", "output_device"}; |
| 416 | BasicSetting<std::string> sink_id{"auto", "output_engine"}; | 415 | BasicSetting<std::string> sink_id{"auto", "output_engine"}; |
| 417 | BasicSetting<bool> audio_muted{false, "audio_muted"}; | 416 | BasicSetting<bool> audio_muted{false, "audio_muted"}; |
| 418 | Setting<bool> enable_audio_stretching{true, "enable_audio_stretching"}; | ||
| 419 | RangedSetting<u8> volume{100, 0, 100, "volume"}; | 417 | RangedSetting<u8> volume{100, 0, 100, "volume"}; |
| 420 | 418 | ||
| 421 | // Core | 419 | // Core |
| @@ -504,14 +502,20 @@ struct Values { | |||
| 504 | 502 | ||
| 505 | Setting<bool> use_docked_mode{true, "use_docked_mode"}; | 503 | Setting<bool> use_docked_mode{true, "use_docked_mode"}; |
| 506 | 504 | ||
| 505 | BasicSetting<bool> enable_raw_input{false, "enable_raw_input"}; | ||
| 506 | |||
| 507 | Setting<bool> vibration_enabled{true, "vibration_enabled"}; | 507 | Setting<bool> vibration_enabled{true, "vibration_enabled"}; |
| 508 | Setting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"}; | 508 | Setting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"}; |
| 509 | 509 | ||
| 510 | Setting<bool> motion_enabled{true, "motion_enabled"}; | 510 | Setting<bool> motion_enabled{true, "motion_enabled"}; |
| 511 | BasicSetting<std::string> motion_device{"engine:motion_emu,update_period:100,sensitivity:0.01", | 511 | BasicSetting<std::string> motion_device{"engine:motion_emu,update_period:100,sensitivity:0.01", |
| 512 | "motion_device"}; | 512 | "motion_device"}; |
| 513 | BasicSetting<std::string> udp_input_servers{InputCommon::CemuhookUDP::DEFAULT_SRV, | 513 | BasicSetting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"}; |
| 514 | "udp_input_servers"}; | 514 | |
| 515 | BasicSetting<bool> pause_tas_on_load{true, "pause_tas_on_load"}; | ||
| 516 | BasicSetting<bool> tas_enable{false, "tas_enable"}; | ||
| 517 | BasicSetting<bool> tas_loop{false, "tas_loop"}; | ||
| 518 | BasicSetting<bool> tas_swap_controllers{true, "tas_swap_controllers"}; | ||
| 515 | 519 | ||
| 516 | BasicSetting<bool> mouse_panning{false, "mouse_panning"}; | 520 | BasicSetting<bool> mouse_panning{false, "mouse_panning"}; |
| 517 | BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; | 521 | BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; |