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 undesired jump-cuts in auto DJ #4693

Merged
merged 7 commits into from
Mar 21, 2022
Merged

Fix undesired jump-cuts in auto DJ #4693

merged 7 commits into from
Mar 21, 2022

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Mar 4, 2022

This fixes https://bugs.launchpad.net/mixxx/+bug/1948975

The also improves the logging in auto DJ in the first commits, disabled by the sDebug.

This is IMHO a major bug that rectifies a 2.3.3 release.

Hopefully we can also fix the issue https://bugs.launchpad.net/mixxx/+bug/1893197

src/library/autodj/autodjprocessor.cpp Outdated Show resolved Hide resolved
const double introEndSample = pToDeck->introEndPosition();
if (introEndSample != Cue::kNoPosition) {
const double introEnd = samplePositionToSeconds(introEndSample, pToDeck);
if (introStart < introStart) {
Copy link
Member

Choose a reason for hiding this comment

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

?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ups, I have messed up the rebase.
I will rebase again.

@@ -0,0 +1,99 @@
#include "util/file.h"
Copy link
Contributor

Choose a reason for hiding this comment

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

Please remove this temporary file and force push

This happened because the track is not able to seek exactly to the intro start
point. In this case taking the  start point as end point does not lead to a zero length intro.
@daschuer
Copy link
Member Author

daschuer commented Mar 7, 2022

Done

@Kunzlinger
Copy link

Kunzlinger commented Mar 12, 2022

Tested AutoDJ with Songs of different lenght and different numbers in AutoDJ Playlist. All transitions works like a charm!
Many Thanks!

Waveform Build #8332!

@daschuer
Copy link
Member Author

Done

@daschuer daschuer mentioned this pull request Mar 14, 2022
@daschuer
Copy link
Member Author

@Swiftb0y: anything else left to do?

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

I don't really understand how the fix works but I suppose this works...

@daschuer
Copy link
Member Author

This commit contains the fix:
4cd4e33
It was a rounding issue, a not defined Intro was treated as a short intro of a length below one sample.

@daschuer
Copy link
Member Author

Merge?

@Swiftb0y
Copy link
Member

I'm concerned about this commit: 49819ef
I'm not sure if there are implications because you changed the if to an if-else.

@daschuer
Copy link
Member Author

This was just a refactoring for readability without effect.
The first if checks for 'playing", the second for "!playing"

@Swiftb0y Swiftb0y added the changelog This PR should be included in the changelog label Mar 21, 2022
@Swiftb0y
Copy link
Member

Ah, makes sense, I missed that.

@Swiftb0y Swiftb0y merged commit 597e23d into mixxxdj:2.3 Mar 21, 2022
@daschuer
Copy link
Member Author

Thank you.

@daschuer daschuer deleted the lp1948975 branch May 4, 2022 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog This PR should be included in the changelog library
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants