Merge pull request #7085 from master0fdisaster/Add-Volume-Hotkeys-OSD-Message

Add OSD message for Volume Hotkeys
This commit is contained in:
Léo Lam authored and GitHub committed 2018-06-07 16:46:19 +02:00
commit 18d5ba30d6
4 files changed
+43 -17

No files matched your search

+19 -10
View File
@@ -200,16 +200,6 @@ void HotkeyScheduler::Run()
if (IsHotkey(HK_READ_ONLY_MODE))
emit ToggleReadOnlyMode();
// Volume
if (IsHotkey(HK_VOLUME_DOWN))
settings.DecreaseVolume(3);
if (IsHotkey(HK_VOLUME_UP))
settings.IncreaseVolume(3);
if (IsHotkey(HK_VOLUME_TOGGLE_MUTE))
AudioCommon::ToggleMuteVolume();
// Wiimote
if (SConfig::GetInstance().m_bt_passthrough_enabled)
{
@@ -251,6 +241,25 @@ void HotkeyScheduler::Run()
g_renderer->ShowOSDMessage(message);
};
// Volume
if (IsHotkey(HK_VOLUME_DOWN))
{
show_msg(OSDMessage::VolumeChanged);
settings.DecreaseVolume(3);
}
if (IsHotkey(HK_VOLUME_UP))
{
show_msg(OSDMessage::VolumeChanged);
settings.IncreaseVolume(3);
}
if (IsHotkey(HK_VOLUME_TOGGLE_MUTE))
{
show_msg(OSDMessage::VolumeChanged);
AudioCommon::ToggleMuteVolume();
}
// Graphics
const auto efb_scale = Config::Get(Config::GFX_EFB_SCALE);