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
fix Loop_out not seeking back #12739
Conversation
The test |
It doesn't so it seems there is indeed a |
Seems I misread the test procedure 🙄 I extended it to cover the case this PR fixes. |
83d31a3
to
30f9bfd
Compare
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.
lgtm
extremely annoyingly, the first time I hand-tested it appeared the fix did not work, but every time I tried afterward it did. Is there a chance that old_loop_info could be blank, but an out point is set? |
Unless someone else can reproduce the failure, I think this is a Good Enough fix for the release. If we find a further edge case later we can fix it in 2.4.1 |
Draft until the test is fixed. |
30f9bfd
to
f7c7aea
Compare
I disabled the test and filed #12741 |
@@ -322,31 +322,47 @@ TEST_F(LoopingControlTest, LoopOutButton_AdjustLoopOutPointInsideLoop) { | |||
EXPECT_FRAMEPOS_EQ_CONTROL(mixxx::audio::FramePos{1500}, m_pLoopEndPoint); | |||
} | |||
|
|||
TEST_F(LoopingControlTest, LoopInOutButtons_QuantizeEnabled) { | |||
TEST_F(LoopingControlTest, DISABLED_LoopInOutButtons_QuantizeEnabled) { |
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.
can you add a short comment that links to the issue?
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.
Yup, done.
f7c7aea
to
663f903
Compare
This fixes seeking in the following situation I noticed in #12522 (comment)
loop_in
= snaps to previous beat
loop_out
= snaps to previous beat, playhead moves 4 beats back inside the loop
loop_out
(= previously: snaps to prev. beat, playhead doesn't move, loop will never be reached)
= FIX: snaps to previous beat, playhead moves 4 beats back inside the loop
Note:
As before, (re)setting loop_out with playpos exactly at loop_out of the inactive loop, playpos should stay at loop_out and not jump to loop_in.
See discussion on Zulip https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/2.2E4.20behaviour.20.2F.20failing.20test.20of.20loop_in.2F_out.20with.20quantize
TODO
LoopInOutButtons_QuantizeEnabled