diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2023-10-04 04:06:21 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-10-04 04:12:06 +0200 |
commit | c84c35ac743c6303fcc1bb96b17ae530a39bd49e (patch) | |
tree | 5129b0f512c91177ce754756b08d68d1ea4c3a6c | |
parent | Merge pull request #11652 from liamwhite/shutdown-goes-brrr (diff) | |
download | yuzu-c84c35ac743c6303fcc1bb96b17ae530a39bd49e.tar yuzu-c84c35ac743c6303fcc1bb96b17ae530a39bd49e.tar.gz yuzu-c84c35ac743c6303fcc1bb96b17ae530a39bd49e.tar.bz2 yuzu-c84c35ac743c6303fcc1bb96b17ae530a39bd49e.tar.lz yuzu-c84c35ac743c6303fcc1bb96b17ae530a39bd49e.tar.xz yuzu-c84c35ac743c6303fcc1bb96b17ae530a39bd49e.tar.zst yuzu-c84c35ac743c6303fcc1bb96b17ae530a39bd49e.zip |
-rw-r--r-- | src/yuzu/configuration/configure_audio.cpp | 3 | ||||
-rw-r--r-- | src/yuzu/configuration/shared_translation.cpp | 3 | ||||
-rw-r--r-- | src/yuzu/main.cpp | 1 | ||||
-rw-r--r-- | src/yuzu/uisettings.h | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index 9ccfb2435..81dd51ad3 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp @@ -42,6 +42,9 @@ void ConfigureAudio::Setup(const ConfigurationShared::Builder& builder) { for (auto* setting : Settings::values.linkage.by_category[category]) { settings.push_back(setting); } + for (auto* setting : UISettings::values.linkage.by_category[category]) { + settings.push_back(setting); + } }; push(Settings::Category::Audio); diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp index 276bdbaba..a4e8af1b4 100644 --- a/src/yuzu/configuration/shared_translation.cpp +++ b/src/yuzu/configuration/shared_translation.cpp @@ -29,9 +29,10 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) { INSERT(Settings, sink_id, "Output Engine:", ""); INSERT(Settings, audio_output_device_id, "Output Device:", ""); INSERT(Settings, audio_input_device_id, "Input Device:", ""); - INSERT(Settings, audio_muted, "Mute audio when in background", ""); + INSERT(Settings, audio_muted, "Mute audio", ""); INSERT(Settings, volume, "Volume:", ""); INSERT(Settings, dump_audio_commands, "", ""); + INSERT(UISettings, mute_when_in_background, "Mute audio when in background", ""); // Core INSERT(Settings, use_multi_core, "Multicore CPU Emulation", ""); diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 16fa92e2c..1753fec12 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1447,6 +1447,7 @@ void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) { Settings::values.audio_muted = false; auto_muted = false; } + UpdateVolumeUI(); } } diff --git a/src/yuzu/uisettings.h b/src/yuzu/uisettings.h index 8efd63f31..8a2caa9dd 100644 --- a/src/yuzu/uisettings.h +++ b/src/yuzu/uisettings.h @@ -103,7 +103,7 @@ struct Values { true, true}; Setting<bool> mute_when_in_background{ - linkage, false, "muteWhenInBackground", Category::Ui, Settings::Specialization::Default, + linkage, false, "muteWhenInBackground", Category::Audio, Settings::Specialization::Default, true, true}; Setting<bool> hide_mouse{ linkage, true, "hideInactiveMouse", Category::UiGeneral, Settings::Specialization::Default, |