Skip to content

add toggle 2x speed #2593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmffmm wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −3
Open

add toggle 2x speed #2593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/frontend/qt_sdl/EmuInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ enum
HK_GuitarGripRed,
HK_GuitarGripYellow,
HK_GuitarGripBlue,
HK_SpeedStep,
HK_MAX
};

Expand Down Expand Up @@ -303,6 +304,7 @@ class EmuInstance
double slowmoFPS;
bool fastForwardToggled;
bool slowmoToggled;
bool speedStepToggled;
bool doAudioSync;
private:

Expand Down
3 changes: 2 additions & 1 deletion src/frontend/qt_sdl/EmuInstanceInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ const char* EmuInstance::hotkeyNames[HK_MAX] =
"HK_GuitarGripGreen",
"HK_GuitarGripRed",
"HK_GuitarGripYellow",
"HK_GuitarGripBlue"
"HK_GuitarGripBlue",
"HK_SpeedStep"
};

std::shared_ptr<SDL_mutex> EmuInstance::joyMutexGlobal = nullptr;
Expand Down
3 changes: 3 additions & 0 deletions src/frontend/qt_sdl/EmuThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ void EmuThread::run()
bool slowmo = false;
emuInstance->fastForwardToggled = false;
emuInstance->slowmoToggled = false;
emuInstance->speedStepToggled = false;

while (emuStatus != emuStatus_Exit)
{
Expand Down Expand Up @@ -332,6 +333,7 @@ void EmuThread::run()

if (emuInstance->hotkeyPressed(HK_FastForwardToggle)) emuInstance->fastForwardToggled = !emuInstance->fastForwardToggled;
if (emuInstance->hotkeyPressed(HK_SlowMoToggle)) emuInstance->slowmoToggled = !emuInstance->slowmoToggled;
if (emuInstance->hotkeyPressed(HK_SpeedStep)) emuInstance->speedStepToggled = !emuInstance->speedStepToggled;

if (emuInstance->hotkeyPressed(HK_AudioMuteToggle)) emuInstance->toggleAudioMute();

Expand All @@ -357,6 +359,7 @@ void EmuThread::run()

if (slowmo) emuInstance->curFPS = emuInstance->slowmoFPS;
else if (fastforward) emuInstance->curFPS = emuInstance->fastForwardFPS;
else if (emuInstance->speedStepToggled) emuInstance->curFPS = emuInstance->targetFPS * 2.0;
else if (!emuInstance->doLimitFPS && !emuInstance->doAudioSync) emuInstance->curFPS = 1000.0;
else emuInstance->curFPS = emuInstance->targetFPS;

Expand Down
6 changes: 4 additions & 2 deletions src/frontend/qt_sdl/InputConfig/InputConfigDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ static constexpr std::initializer_list<int> hk_general =
HK_PowerButton,
HK_VolumeUp,
HK_VolumeDown,
HK_AudioMuteToggle
HK_AudioMuteToggle,
HK_SpeedStep
};

static constexpr std::initializer_list<const char*> hk_general_labels =
Expand All @@ -89,7 +90,8 @@ static constexpr std::initializer_list<const char*> hk_general_labels =
"DSi Power button",
"DSi Volume up",
"DSi Volume down",
"Toggle audio mute"
"Toggle audio mute",
"Toggle 2x speed"
};

static_assert(hk_general.size() == hk_general_labels.size());
Expand Down