diff options
| -rw-r--r-- | src/common/settings.cpp | 2 | ||||
| -rw-r--r-- | src/common/settings_common.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_audio.cpp | 10 | ||||
| -rw-r--r-- | src/yuzu/uisettings.h | 10 |
5 files changed, 19 insertions, 6 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 98b43e49c..51717be06 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -203,6 +203,8 @@ const char* TranslateCategory(Category category) { | |||
| 203 | case Category::Ui: | 203 | case Category::Ui: |
| 204 | case Category::UiGeneral: | 204 | case Category::UiGeneral: |
| 205 | return "UI"; | 205 | return "UI"; |
| 206 | case Category::UiAudio: | ||
| 207 | return "UiAudio"; | ||
| 206 | case Category::UiLayout: | 208 | case Category::UiLayout: |
| 207 | return "UiLayout"; | 209 | return "UiLayout"; |
| 208 | case Category::UiGameList: | 210 | case Category::UiGameList: |
diff --git a/src/common/settings_common.h b/src/common/settings_common.h index 1800ab10d..7943223eb 100644 --- a/src/common/settings_common.h +++ b/src/common/settings_common.h | |||
| @@ -32,6 +32,7 @@ enum class Category : u32 { | |||
| 32 | AddOns, | 32 | AddOns, |
| 33 | Controls, | 33 | Controls, |
| 34 | Ui, | 34 | Ui, |
| 35 | UiAudio, | ||
| 35 | UiGeneral, | 36 | UiGeneral, |
| 36 | UiLayout, | 37 | UiLayout, |
| 37 | UiGameList, | 38 | UiGameList, |
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index baa3e55f3..42bbb2964 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -360,6 +360,7 @@ void Config::ReadAudioValues() { | |||
| 360 | qt_config->beginGroup(QStringLiteral("Audio")); | 360 | qt_config->beginGroup(QStringLiteral("Audio")); |
| 361 | 361 | ||
| 362 | ReadCategory(Settings::Category::Audio); | 362 | ReadCategory(Settings::Category::Audio); |
| 363 | ReadCategory(Settings::Category::UiAudio); | ||
| 363 | 364 | ||
| 364 | qt_config->endGroup(); | 365 | qt_config->endGroup(); |
| 365 | } | 366 | } |
| @@ -900,6 +901,7 @@ void Config::SaveAudioValues() { | |||
| 900 | qt_config->beginGroup(QStringLiteral("Audio")); | 901 | qt_config->beginGroup(QStringLiteral("Audio")); |
| 901 | 902 | ||
| 902 | WriteCategory(Settings::Category::Audio); | 903 | WriteCategory(Settings::Category::Audio); |
| 904 | WriteCategory(Settings::Category::UiAudio); | ||
| 903 | 905 | ||
| 904 | qt_config->endGroup(); | 906 | qt_config->endGroup(); |
| 905 | } | 907 | } |
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index 81dd51ad3..9b6ef47a7 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp | |||
| @@ -38,17 +38,21 @@ void ConfigureAudio::Setup(const ConfigurationShared::Builder& builder) { | |||
| 38 | 38 | ||
| 39 | std::map<u32, QWidget*> hold; | 39 | std::map<u32, QWidget*> hold; |
| 40 | 40 | ||
| 41 | auto push = [&](Settings::Category category) { | 41 | auto push_settings = [&](Settings::Category category) { |
| 42 | for (auto* setting : Settings::values.linkage.by_category[category]) { | 42 | for (auto* setting : Settings::values.linkage.by_category[category]) { |
| 43 | settings.push_back(setting); | 43 | settings.push_back(setting); |
| 44 | } | 44 | } |
| 45 | }; | ||
| 46 | |||
| 47 | auto push_ui_settings = [&](Settings::Category category) { | ||
| 45 | for (auto* setting : UISettings::values.linkage.by_category[category]) { | 48 | for (auto* setting : UISettings::values.linkage.by_category[category]) { |
| 46 | settings.push_back(setting); | 49 | settings.push_back(setting); |
| 47 | } | 50 | } |
| 48 | }; | 51 | }; |
| 49 | 52 | ||
| 50 | push(Settings::Category::Audio); | 53 | push_settings(Settings::Category::Audio); |
| 51 | push(Settings::Category::SystemAudio); | 54 | push_settings(Settings::Category::SystemAudio); |
| 55 | push_ui_settings(Settings::Category::UiAudio); | ||
| 52 | 56 | ||
| 53 | for (auto* setting : settings) { | 57 | for (auto* setting : settings) { |
| 54 | auto* widget = builder.BuildWidget(setting, apply_funcs); | 58 | auto* widget = builder.BuildWidget(setting, apply_funcs); |
diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index 77d992c54..3485a6347 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h | |||
| @@ -109,9 +109,13 @@ struct Values { | |||
| 109 | Settings::Specialization::Default, | 109 | Settings::Specialization::Default, |
| 110 | true, | 110 | true, |
| 111 | true}; | 111 | true}; |
| 112 | Setting<bool> mute_when_in_background{ | 112 | Setting<bool> mute_when_in_background{linkage, |
| 113 | linkage, false, "muteWhenInBackground", Category::Audio, Settings::Specialization::Default, | 113 | false, |
| 114 | true, true}; | 114 | "muteWhenInBackground", |
| 115 | Category::UiAudio, | ||
| 116 | Settings::Specialization::Default, | ||
| 117 | true, | ||
| 118 | true}; | ||
| 115 | Setting<bool> hide_mouse{ | 119 | Setting<bool> hide_mouse{ |
| 116 | linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default, | 120 | linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default, |
| 117 | true, true}; | 121 | true, true}; |