diff --git a/src/config/CemuConfig.cpp b/src/config/CemuConfig.cpp index 94f20f2b..ac96b239 100644 --- a/src/config/CemuConfig.cpp +++ b/src/config/CemuConfig.cpp @@ -350,6 +350,7 @@ void CemuConfig::Load(XMLConfigParser& parser) hotkeys.toggleFullscreen = xml_hotkeys.get("ToggleFullscreen", sHotkeyCfg{uKeyboardHotkey{WXK_F11}}); hotkeys.toggleFullscreenAlt = xml_hotkeys.get("ToggleFullscreenAlt", sHotkeyCfg{uKeyboardHotkey{WXK_CONTROL_M, true}}); // ALT+ENTER hotkeys.takeScreenshot = xml_hotkeys.get("TakeScreenshot", sHotkeyCfg{uKeyboardHotkey{WXK_F12}}); + hotkeys.toggleFastForward = xml_hotkeys.get("ToggleFastForward", sHotkeyCfg{}); // emulatedusbdevices auto usbdevices = parser.get("EmulatedUsbDevices"); @@ -559,6 +560,7 @@ void CemuConfig::Save(XMLConfigParser& parser) xml_hotkeys.set("ToggleFullscreen", hotkeys.toggleFullscreen); xml_hotkeys.set("ToggleFullscreenAlt", hotkeys.toggleFullscreenAlt); xml_hotkeys.set("TakeScreenshot", hotkeys.takeScreenshot); + xml_hotkeys.set("ToggleFastForward", hotkeys.toggleFastForward); // emulated usb devices auto usbdevices = config.set("EmulatedUsbDevices"); diff --git a/src/config/CemuConfig.h b/src/config/CemuConfig.h index 274ecdbb..f7c646f9 100644 --- a/src/config/CemuConfig.h +++ b/src/config/CemuConfig.h @@ -548,6 +548,7 @@ struct CemuConfig sHotkeyCfg toggleFullscreenAlt; sHotkeyCfg exitFullscreen; sHotkeyCfg takeScreenshot; + sHotkeyCfg toggleFastForward; } hotkeys{}; // debug diff --git a/src/gui/input/HotkeySettings.cpp b/src/gui/input/HotkeySettings.cpp index a0f1add6..15f5ac51 100644 --- a/src/gui/input/HotkeySettings.cpp +++ b/src/gui/input/HotkeySettings.cpp @@ -14,6 +14,7 @@ const std::unordered_map> HotkeySettings: {&s_cfgHotkeys.toggleFullscreenAlt, [](void) { s_mainWindow->ShowFullScreen(!s_mainWindow->IsFullScreen()); }}, {&s_cfgHotkeys.exitFullscreen, [](void) { s_mainWindow->ShowFullScreen(false); }}, {&s_cfgHotkeys.takeScreenshot, [](void) { g_window_info.has_screenshot_request = true; }}, + {&s_cfgHotkeys.toggleFastForward, [](void) { ActiveSettings::SetTimerShiftFactor((ActiveSettings::GetTimerShiftFactor() < 3) ? 3 : 1); }}, }; struct HotkeyEntry @@ -62,6 +63,7 @@ HotkeySettings::HotkeySettings(wxWindow* parent) /* hotkeys */ CreateHotkeyRow("Toggle fullscreen", s_cfgHotkeys.toggleFullscreen); CreateHotkeyRow("Take screenshot", s_cfgHotkeys.takeScreenshot); + CreateHotkeyRow("Toggle fast-forward", s_cfgHotkeys.toggleFastForward); m_controllerTimer = new wxTimer(this); Bind(wxEVT_TIMER, &HotkeySettings::OnControllerTimer, this);