-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Don't immediately jump when loopOut is pressed in quantized mode #2260
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -354,19 +354,29 @@ double LoopingControl::nextTrigger(bool reverse, | |
|
||
LoopSamples loopSamples = m_loopSamples.getValue(); | ||
|
||
// adjust loop in was toggled (slotLoopIn or slotLoopOut) | ||
if (m_bAdjustingLoopInOld != m_bAdjustingLoopIn) { | ||
m_bAdjustingLoopInOld = m_bAdjustingLoopIn; | ||
if (reverse && !m_bAdjustingLoopIn) { | ||
|
||
// adjust loop in was true and is now false and is only relevant in reverse mode | ||
// in non-quantized mode we jump immediately to the end of the loop while in quantized mode we wait until the loop start is reached | ||
if (reverse && !m_bAdjustingLoopIn && !m_pQuantizeEnabled->toBool()) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. // If the loop in button was released in reverse mode, we need to jump to loop end to not fall out of the just set loop. This must not happen in qantized mode. Here we need to jump to a qantized position, which is handeled in .... |
||
m_oldLoopSamples = loopSamples; | ||
// set the target sample to the current loop end (jump to end) | ||
*pTarget = loopSamples.end; | ||
return currentSample; | ||
} | ||
} | ||
|
||
// adjust loop out was toggled (slotLoopOut or slotLoopIn) | ||
if (m_bAdjustingLoopOutOld != m_bAdjustingLoopOut) { | ||
m_bAdjustingLoopOutOld = m_bAdjustingLoopOut; | ||
if (!reverse && !m_bAdjustingLoopOut) { | ||
|
||
// adjust loop out was true and is now false and is only relevant in forward mode | ||
// in non-quantized mode we jump immediately to the beginning of the loop while in quantized mode we wait until the loop end is reached | ||
if (!reverse && !m_bAdjustingLoopOut && !m_pQuantizeEnabled->toBool()) { | ||
m_oldLoopSamples = loopSamples; | ||
// set the target sample to the current loop start (jump to beginning) | ||
*pTarget = loopSamples.start; | ||
return currentSample; | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
//m_bAdjustingLoopIn is true while the LoopIn button is pressed, (slotLoopIn)