Skip to content

Loopescape Bugs #1487

Merged
uklotzde merged 8 commits intomixxxdj:2.1from
daschuer:loopescape
Jan 22, 2018
Merged

Loopescape Bugs #1487
uklotzde merged 8 commits intomixxxdj:2.1from
daschuer:loopescape

Conversation

@daschuer
Copy link
Copy Markdown
Member

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jan 18, 2018

I will test this soon.

I forgot to report a bug that might be related:
tiny loops don't get activated
https://bugs.launchpad.net/mixxx/+bug/1744162

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jan 20, 2018

I just tested the fixes, and I think I stressed it a lot with controller and GUI buttons.
1/32 beatloops via spinboox/loop_toggle still fail in less than 1 of 10 tests, though.
Activating a 1/16 loop, then halving it to 1/32 works 100% here.

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jan 20, 2018

I can 100% reproduce a failing 1/32 beatloop (rolling or normal)

  • if it's the first loop I try to activate after track load or
  • if I try to set that loop at a play position before any other previously set (and working) loop

Still doesn't matter if I trigger beatlooproll_0.03125_activate or beatloop_size = 1/32 + beatloop_activate.
After that, it fails now & then for 1/32.

Edited

@daschuer
Copy link
Copy Markdown
Member Author

Got it! Just a typo.

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jan 20, 2018

Awesomecredible! Just tested again, 1/32 loops only.. And it works like a charm now!
Thanks!

@daschuer
Copy link
Copy Markdown
Member Author

Thank you very much for testing. Does anyone wants to do a code review?

Comment thread src/engine/loopingcontrol.cpp Outdated
// jump immediately
qDebug() << currentSample <<
m_oldLoopSamples.start << loopSamples.start << loopSamples.end;
//qDebug() << currentSample <<
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commented out debug output is confusing, because m_oldLoopSamples == loopSamples after the assignment and why should we print the pTarget pointer? I think it is better to simply remove this commented out piece of code.

There is also a minor typo in another comment (line 390) above if you touch this file: "Ceck" -> "Check"

@uklotzde
Copy link
Copy Markdown
Contributor

I don't understand each and every detail of the code, but with the additional comments the special case handling should be clear. Just one minor remark. I rely on @ronso0 for testing.

@uklotzde
Copy link
Copy Markdown
Contributor

LGTM.

@uklotzde uklotzde merged commit 90816b0 into mixxxdj:2.1 Jan 22, 2018
@uklotzde
Copy link
Copy Markdown
Contributor

@daschuer I should have run the tests locally before merging:

src/test/looping_control_test.cpp:536: Failure
Value of: m_pChannel1->getEngineBuffer()->m_pLoopingControl->getCurrentSample()
  Actual: 199
Expected: 200
src/test/looping_control_test.cpp:550: Failure
Value of: m_pChannel1->getEngineBuffer()->m_pLoopingControl->getCurrentSample()
  Actual: 199
Expected: 200
in ~EngineMaster() 
[  FAILED  ] LoopingControlTest.LoopMoveTest (39 ms)
[----------] 1 test from LoopingControlTest (39 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (39 ms total)
[  PASSED  ] 0 tests.
[  FAILED  ] 1 test, listed below:
[  FAILED  ] LoopingControlTest.LoopMoveTest

Looks like a rounding error/deviation?

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jan 22, 2018

Could I have noticed that fail when testing manually?
Because, actually moving and resizing worked correctly.

@uklotzde
Copy link
Copy Markdown
Contributor

@ronso0 No, don't worry ;) It is just a one-off error in one of our unit tests. The infamous sample vs. frame position issue bites us once again.

@daschuer
Copy link
Copy Markdown
Member Author

I cannot reproduce the issue here. Maybe this is also a gcc 7.2.1 rounding issue. I give it a try.

@daschuer daschuer mentioned this pull request Jan 22, 2018
@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Feb 22, 2018

This isn't merged to master yet, or is it?
I experience the same bug there

@daschuer
Copy link
Copy Markdown
Member Author

This was recently merged to master 2018-02-19 18:15:42
231132e

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants