Skip to content

Commit

Permalink
Merge pull request #1665 from SynthstromAudible/cherry-pick-release/1…
Browse files Browse the repository at this point in the history
….1-15d7598914bf7993e3c9608f54053cd1e633812f

move stutter out of the fallthrough cases
  • Loading branch information
m-m-adams authored Apr 3, 2024
2 parents 2c429e5 + 53b8442 commit 04bfa07
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions src/deluge/gui/views/view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2591,15 +2591,7 @@ ActionResult View::clipStatusPadAction(Clip* clip, bool on, int32_t yDisplayIfIn
}
// No break
case UI_MODE_CLIP_PRESSED_IN_SONG_VIEW:
case UI_MODE_STUTTERING:
// this code is needed to allow users to launch clips while stuttering
// without it the deluge becomes unresponsive if you try to launch a clip while stuttering
// this is because it gets stuck in the stuttering UI mode and can't get out
if (on) {
sessionView.performActionOnPadRelease = false; // Even though there's a chance we're not in session view
session.toggleClipStatus(clip, NULL, Buttons::isShiftButtonPressed(), kInternalButtonPressLatency);
}
break;

case UI_MODE_HOLDING_STATUS_PAD:
if (on) {
enterUIMode(UI_MODE_HOLDING_STATUS_PAD);
Expand All @@ -2612,6 +2604,16 @@ ActionResult View::clipStatusPadAction(Clip* clip, bool on, int32_t yDisplayIfIn
}
break;

case UI_MODE_STUTTERING:
// this code is needed to allow users to launch clips while stuttering
// without it the deluge becomes unresponsive if you try to launch a clip while stuttering
// this is because it gets stuck in the stuttering UI mode and can't get out
if (on) {
sessionView.performActionOnPadRelease = false; // Even though there's a chance we're not in session view
session.toggleClipStatus(clip, NULL, Buttons::isShiftButtonPressed(), kInternalButtonPressLatency);
}
break;

#ifdef soloButtonX
case UI_MODE_SOLO_BUTTON_HELD:
#else
Expand Down

0 comments on commit 04bfa07

Please sign in to comment.