piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add OSD message for Volume Hotkeys

Browse Source 
This pr adds an OnScreenDisplay message when you use the Volume hotkeys.
Just to have visual feedback.
This commit is contained in:
master0fdisaster 2018-06-05 23:34:28 +02:00
parent 21898a0c5a
commit 7a90ea2752
4 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/DolphinQt2/HotkeyScheduler.cpp
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);

24
Source/Core/DolphinWX/Frame.cpp
View File

@ -1324,12 +1324,6 @@ void CFrame::ParseHotkeys()
Core::SaveScreenShot();
if (IsHotkey(HK_EXIT))
wxPostEvent(this, wxCommandEvent(wxEVT_MENU, wxID_EXIT));
if (IsHotkey(HK_VOLUME_DOWN))
AudioCommon::DecreaseVolume(3);
if (IsHotkey(HK_VOLUME_UP))
AudioCommon::IncreaseVolume(3);
if (IsHotkey(HK_VOLUME_TOGGLE_MUTE))
AudioCommon::ToggleMuteVolume();
if (SConfig::GetInstance().m_bt_passthrough_enabled)
{
@ -1423,6 +1417,24 @@ void CFrame::ParseHotkeys()
g_renderer->ShowOSDMessage(message);
};
if (IsHotkey(HK_VOLUME_DOWN))
{
show_msg(OSDMessage::VolumeChanged);
AudioCommon::DecreaseVolume(3);
}
if (IsHotkey(HK_VOLUME_UP))
{
show_msg(OSDMessage::VolumeChanged);
AudioCommon::IncreaseVolume(3);
}
if (IsHotkey(HK_VOLUME_TOGGLE_MUTE))
{
show_msg(OSDMessage::VolumeChanged);
AudioCommon::ToggleMuteVolume();
}
if (IsHotkey(HK_INCREASE_IR))
{
show_msg(OSDMessage::IRChanged);

4
Source/Core/VideoCommon/RenderBase.cpp
View File

@ -329,6 +329,9 @@ void Renderer::DrawDebugText()
ar_text = "Auto";
break;
}
const std::string audio_text = SConfig::GetInstance().m_IsMuted ?
"Muted" :
std::to_string(SConfig::GetInstance().m_Volume) + "%";
const char* const efbcopy_text = g_ActiveConfig.bSkipEFBCopyToRam ? "to Texture" : "to RAM";
const char* const xfbcopy_text = g_ActiveConfig.bSkipXFBCopyToRam ? "to Texture" : "to RAM";
@ -345,6 +348,7 @@ void Renderer::DrawDebugText()
std::lround(SConfig::GetInstance().m_EmulationSpeed * 100.f)),
std::string("Copy XFB: ") + xfbcopy_text +
(g_ActiveConfig.bImmediateXFB ? " (Immediate)" : ""),
"Volume: " + audio_text,
};
enum

3
Source/Core/VideoCommon/RenderBase.h
View File

@ -62,7 +62,8 @@ enum class OSDMessage : s32
EFBCopyToggled = 3,
FogToggled = 4,
SpeedChanged = 5,
XFBChanged = 6
XFBChanged = 6,
VolumeChanged = 7,
};
// Renderer really isn't a very good name for this class - it's more like "Misc".