Merge pull request #10124 from malleoz/play-recording-hotkey-support

HotkeyScheduler: add PlayRecording hotkey support
This commit is contained in:
JosJuice
2021-09-29 16:26:56 +02:00
committed by GitHub
3 changed files with 8 additions and 0 deletions

View File

@ -186,7 +186,13 @@ void HotkeyScheduler::Run()
emit ExitHotkey(); emit ExitHotkey();
if (!Core::IsRunningAndStarted()) if (!Core::IsRunningAndStarted())
{
// Only check for Play Recording hotkey when no game is running
if (IsHotkey(HK_PLAY_RECORDING))
emit PlayRecording();
continue; continue;
}
// Disc // Disc

View File

@ -47,6 +47,7 @@ signals:
void StateLoadUndo(); void StateLoadUndo();
void StateSaveUndo(); void StateSaveUndo();
void StartRecording(); void StartRecording();
void PlayRecording();
void ExportRecording(); void ExportRecording();
void ToggleReadOnlyMode(); void ToggleReadOnlyMode();
void ConnectWiiRemote(int id); void ConnectWiiRemote(int id);

View File

@ -590,6 +590,7 @@ void MainWindow::ConnectHotkeys()
&MainWindow::SetStateSlot); &MainWindow::SetStateSlot);
connect(m_hotkey_scheduler, &HotkeyScheduler::StartRecording, this, connect(m_hotkey_scheduler, &HotkeyScheduler::StartRecording, this,
&MainWindow::OnStartRecording); &MainWindow::OnStartRecording);
connect(m_hotkey_scheduler, &HotkeyScheduler::PlayRecording, this, &MainWindow::OnPlayRecording);
connect(m_hotkey_scheduler, &HotkeyScheduler::ExportRecording, this, connect(m_hotkey_scheduler, &HotkeyScheduler::ExportRecording, this,
&MainWindow::OnExportRecording); &MainWindow::OnExportRecording);
connect(m_hotkey_scheduler, &HotkeyScheduler::ConnectWiiRemote, this, connect(m_hotkey_scheduler, &HotkeyScheduler::ConnectWiiRemote, this,