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.

Sign up for GitHub

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

Jump to bottom

Review suggestions from #11479 #11492

Merged
merged 3 commits into from
Apr 18, 2023
Merged

Review suggestions from #11479 #11492

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3a5aaa
Improve warning messages
daschuer Apr 17, 2023
b3a95ef
move endSamplePosition closer to usage
daschuer Apr 17, 2023
65cd5b0
Rename trackEndSample
daschuer Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions src/library/autodj/autodjprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,18 +1074,18 @@ void AutoDJProcessor::playerOutroEndChanged(DeckAttributes* pAttributes, double
}

double AutoDJProcessor::getIntroStartSecond(DeckAttributes* pDeck) {
double endSamplePosition = pDeck->trackSamples();
double trackEndSample = pDeck->trackSamples();
double introStartSample = pDeck->introStartPosition();
if (introStartSample == Cue::kNoPosition || introStartSample > endSamplePosition) {
if (introStartSample == Cue::kNoPosition || introStartSample > trackEndSample) {
return getFirstSoundSecond(pDeck);
}
return samplePositionToSeconds(introStartSample, pDeck);
}

double AutoDJProcessor::getIntroEndSecond(DeckAttributes* pDeck) {
double endSamplePosition = pDeck->trackSamples();
double trackEndSample = pDeck->trackSamples();
double introEndSample = pDeck->introEndPosition();
if (introEndSample == Cue::kNoPosition || introEndSample > endSamplePosition) {
if (introEndSample == Cue::kNoPosition || introEndSample > trackEndSample) {
// Assume a zero length intro if introEnd is not set.
// The introStart is automatically placed by AnalyzerSilence, so use
// that as a fallback if the user has not placed outroStart. If it has
Expand All @@ -1096,9 +1096,9 @@ double AutoDJProcessor::getIntroEndSecond(DeckAttributes* pDeck) {
}

double AutoDJProcessor::getOutroStartSecond(DeckAttributes* pDeck) {
double endSamplePosition = pDeck->trackSamples();
double trackEndSample = pDeck->trackSamples();
double outroStartSample = pDeck->outroStartPosition();
if (outroStartSample == Cue::kNoPosition || outroStartSample > endSamplePosition) {
if (outroStartSample == Cue::kNoPosition || outroStartSample > trackEndSample) {
// Assume a zero length outro if outroStart is not set.
// The outroEnd is automatically placed by AnalyzerSilence, so use
// that as a fallback if the user has not placed outroStart. If it has
Expand All @@ -1109,9 +1109,9 @@ double AutoDJProcessor::getOutroStartSecond(DeckAttributes* pDeck) {
}

double AutoDJProcessor::getOutroEndSecond(DeckAttributes* pDeck) {
double endSamplePosition = pDeck->trackSamples();
double trackEndSample = pDeck->trackSamples();
double outroEndSample = pDeck->outroEndPosition();
if (outroEndSample == Cue::kNoPosition || outroEndSample > endSamplePosition) {
if (outroEndSample == Cue::kNoPosition || outroEndSample > trackEndSample) {
return getLastSoundSecond(pDeck);
}
return samplePositionToSeconds(outroEndSample, pDeck);;
Expand All @@ -1123,16 +1123,17 @@ double AutoDJProcessor::getFirstSoundSecond(DeckAttributes* pDeck) {
return 0.0;
}

double endSamplePosition = pDeck->trackSamples();
CuePointer pFromTrackAudibleSound = pTrack->findCueByType(mixxx::CueType::AudibleSound);
if (pFromTrackAudibleSound) {
double firstSound = pFromTrackAudibleSound->getPosition();
if (firstSound > 0.0) {
if (firstSound <= endSamplePosition) {
double trackEndSample = pDeck->trackSamples();
if (firstSound <= trackEndSample) {
return samplePositionToSeconds(firstSound, pDeck);
} else {
qWarning() << "Audible Sound Cue starts after track end using:"
<< pTrack->getLocation();
qWarning() << "Audible Sound Cue starts after track end in:"
<< pTrack->getLocation()
<< "Using the first sample instead.";
}
}
}
Expand All @@ -1145,20 +1146,21 @@ double AutoDJProcessor::getLastSoundSecond(DeckAttributes* pDeck) {
return 0.0;
}

double endSamplePosition = pDeck->trackSamples();
double trackEndSample = pDeck->trackSamples();
CuePointer pCueAudibleSound = pTrack->findCueByType(mixxx::CueType::AudibleSound);
if (pCueAudibleSound && pCueAudibleSound->getLength() > 0) {
double lastSound = pCueAudibleSound->getEndPosition();
if (lastSound > 0) {
if (lastSound <= endSamplePosition) {
if (lastSound <= trackEndSample) {
return samplePositionToSeconds(lastSound, pDeck);
} else {
qWarning() << "Audible Sound Cue ends after track end using:"
<< pTrack->getLocation();
qWarning() << "Audible Sound Cue ends after track end in:"
<< pTrack->getLocation()
<< "Using the last sample instead.";
}
}
}
return samplePositionToSeconds(endSamplePosition, pDeck);
return samplePositionToSeconds(trackEndSample, pDeck);
}

double AutoDJProcessor::getEndSecond(DeckAttributes* pDeck) {
Expand All @@ -1167,8 +1169,8 @@ double AutoDJProcessor::getEndSecond(DeckAttributes* pDeck) {
return 0.0;
}

double endSamplePosition = pDeck->trackSamples();
return samplePositionToSeconds(endSamplePosition, pDeck);
double trackEndSample = pDeck->trackSamples();
return samplePositionToSeconds(trackEndSample, pDeck);
}

double AutoDJProcessor::samplePositionToSeconds(double samplePosition, DeckAttributes* pDeck) {
Expand Down