Skip to content
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 sharp cut transition after cueing a track without a defined intro #11629

Merged
merged 3 commits into from Jun 12, 2023

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Jun 4, 2023

This fixed #11621

It also adds a plausibility check for the intro length. Reject intros that are extended by more than the original length or by the transition time.

This fixes a bug where a micro seek causes a minimal intro which leads to sharp transition.
@daschuer daschuer changed the title Fix sharp cut transition aftere cuing a track without a defined intro Fix sharp cut transition after cueing a track without a defined intro Jun 4, 2023
@daschuer
Copy link
Member Author

daschuer commented Jun 5, 2023

I need when I find time.

@daschuer daschuer marked this pull request as draft June 5, 2023 09:21
@daschuer daschuer marked this pull request as ready for review June 5, 2023 15:39
@daschuer
Copy link
Member Author

daschuer commented Jun 5, 2023

I could not reproduce the issue using the PC only, also toggling quantize does not trigger it, but a micro movement on the jog wheel can reproduce the issue.

@ikr83
Copy link

ikr83 commented Jun 5, 2023

I just tried on Windows and it's perfect !! Thanx!!

Comment on lines +1284 to +1290
// Limit the intro length that results from a revers seek
// to a reasonable values. If the seek was too big, ignore it.
introLength = introEnd - toDeckStartSeconds;
if (introLength > (introEnd - introStart) * 2 &&
introLength > (introEnd - introStart) + m_transitionTime &&
introLength > outroLength) {
introLength = 0;
Copy link
Member

Choose a reason for hiding this comment

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

why this limitation? IIUC if the user seeks far before the intro, then this will just skip the fade, does this make sense? Why would this be desirable?

Copy link
Member Author

Choose a reason for hiding this comment

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

Imagine a live recording with some introduction words.
The user probably has marked an intro when the music starts. Without this change and with a previous track without an outro the loooong intro time is used for fading if it is cued at 0:00. This is likely not desired. Now the transition time from the spin box is used in this case.

The other use case is the part of the bug fix. If the track is cued at intro start and the user touches the jog for a small seek. The intro is still used.

Copy link
Member

Choose a reason for hiding this comment

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

Makes sense I guess. I just worry about the complexity this introduces. AutoDJ is already quite unpredictable IMO and this doesn't make it any better.

Copy link
Member

Choose a reason for hiding this comment

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

It's also a drop in the bucket, so who cares...

@Swiftb0y Swiftb0y merged commit 6385f30 into mixxxdj:2.3 Jun 12, 2023
8 checks passed
@daschuer daschuer added this to the 2.4.0 milestone Dec 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants