Merge pull request #1975 from soaresden/master

Duckstation - Adding F8 to change discs
This commit is contained in:
Connor McLaughlin 2021-04-18 13:52:39 +10:00 committed by GitHub
commit 021a3677f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1869,6 +1869,17 @@ void CommonHostInterface::RegisterGeneralHotkeys()
SaveScreenshot(); SaveScreenshot();
}); });
RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("ChangeDisc"),
StaticString(TRANSLATABLE("Hotkeys", "ChangeDisc")), [this](bool pressed) {
if (pressed && System::IsValid() && System::HasMediaSubImages())
{
const u32 current = System::GetMediaSubImageIndex();
const u32 next = (current + 1) % System::GetMediaSubImageCount();
if (current != next)
System::SwitchMediaSubImage(next);
}
});
RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("FrameStep"), RegisterHotkey(StaticString(TRANSLATABLE("Hotkeys", "General")), StaticString("FrameStep"),
StaticString(TRANSLATABLE("Hotkeys", "Frame Step")), [this](bool pressed) { StaticString(TRANSLATABLE("Hotkeys", "Frame Step")), [this](bool pressed) {
if (pressed && System::IsValid()) if (pressed && System::IsValid())
@ -2550,6 +2561,7 @@ void CommonHostInterface::SetDefaultSettings(SettingsInterface& si)
si.SetStringValue("Hotkeys", "IncreaseResolutionScale", "Keyboard/PageUp"); si.SetStringValue("Hotkeys", "IncreaseResolutionScale", "Keyboard/PageUp");
si.SetStringValue("Hotkeys", "DecreaseResolutionScale", "Keyboard/PageDown"); si.SetStringValue("Hotkeys", "DecreaseResolutionScale", "Keyboard/PageDown");
si.SetStringValue("Hotkeys", "ToggleSoftwareRendering", "Keyboard/End"); si.SetStringValue("Hotkeys", "ToggleSoftwareRendering", "Keyboard/End");
si.SetStringValue("Hotkeys", "ChangeDisc", "Keyboard/F8");
si.SetStringValue("Main", "ControllerBackend", si.SetStringValue("Main", "ControllerBackend",
ControllerInterface::GetBackendName(ControllerInterface::GetDefaultBackend())); ControllerInterface::GetBackendName(ControllerInterface::GetDefaultBackend()));