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

EngineControl: Use mixxx::audio::FramePos #4186

Merged
merged 7 commits into from Aug 10, 2021
Merged

EngineControl: Use mixxx::audio::FramePos #4186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73de966
EngineControl: Use mixxx::audio::FramePos in notifySeek()
Holzhaus Aug 6, 2021
036754d
EngineControl: Use mixxx::audio::FramePos in seekAbs/seekExact
Holzhaus Aug 6, 2021
3cf0fec
EngineControl: Replace SampleOfTrack with FrameInfo struct
Holzhaus Aug 6, 2021
9d01741
EngineControl: Use mixxx::audio::FramePos for setLoop()/setBeatLoop()
Holzhaus Aug 6, 2021
41711d8
VinylControlControl: Ensure that the track end position is valid
Holzhaus Aug 10, 2021
7208bb2
PositionScratchController: Ensure that seek positions are always valid
Holzhaus Aug 10, 2021
db86680
EngineControl: Use initializer list to set FrameInfo
Holzhaus Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 18 additions & 23 deletions src/engine/controls/bpmcontrol.cpp
View file
Open in desktop
Expand Up @@ -206,7 +206,7 @@ void BpmControl::slotTranslateBeatsEarlier(double v) {
}
const mixxx::BeatsPointer pBeats = pTrack->getBeats();
if (pBeats) {
const double sampleOffset = getSampleOfTrack().rate * -0.01;
const double sampleOffset = frameInfo().sampleRate * -0.01;
const mixxx::audio::FrameDiff_t frameOffset = sampleOffset / mixxx::kEngineChannelCount;
pTrack->trySetBeats(pBeats->translate(frameOffset));
}
Expand All @@ -222,8 +222,8 @@ void BpmControl::slotTranslateBeatsLater(double v) {
}
const mixxx::BeatsPointer pBeats = pTrack->getBeats();
if (pBeats) {
// TODO(rryan): Track::getSampleRate is possibly inaccurate!
const double sampleOffset = getSampleOfTrack().rate * 0.01;
// TODO(rryan): Track::frameInfo is possibly inaccurate!
const double sampleOffset = frameInfo().sampleRate * 0.01;
const mixxx::audio::FrameDiff_t frameOffset = sampleOffset / mixxx::kEngineChannelCount;
pTrack->trySetBeats(pBeats->translate(frameOffset));
}
Expand Down Expand Up @@ -1038,10 +1038,7 @@ void BpmControl::slotBeatsTranslate(double v) {
}
const mixxx::BeatsPointer pBeats = pTrack->getBeats();
if (pBeats) {
const auto currentPosition =
mixxx::audio::FramePos::fromEngineSamplePos(
getSampleOfTrack().current)
.toLowerFrameBoundary();
const auto currentPosition = frameInfo().currentPosition.toLowerFrameBoundary();
const auto closestBeat = pBeats->findClosestBeat(currentPosition);
const mixxx::audio::FrameDiff_t delta = currentPosition - closestBeat;
pTrack->trySetBeats(pBeats->translate(delta));
Expand All @@ -1062,7 +1059,7 @@ void BpmControl::slotBeatsTranslateMatchAlignment(double v) {
// otherwise it will always return 0 if sync lock is active.
m_dUserOffset.setValue(0.0);

double sampleOffset = getPhaseOffset(getSampleOfTrack().current);
double sampleOffset = getPhaseOffset(frameInfo().currentPosition.toEngineSamplePos());
const mixxx::audio::FrameDiff_t frameOffset = sampleOffset / mixxx::kEngineChannelCount;
pTrack->trySetBeats(pBeats->translate(-frameOffset));
}
Expand All @@ -1073,10 +1070,7 @@ mixxx::Bpm BpmControl::updateLocalBpm() {
mixxx::Bpm localBpm;
const mixxx::BeatsPointer pBeats = m_pBeats;
if (pBeats) {
const auto currentPosition =
mixxx::audio::FramePos::fromEngineSamplePos(
getSampleOfTrack().current);
localBpm = pBeats->getBpmAroundPosition(currentPosition, kLocalBpmSpan);
localBpm = pBeats->getBpmAroundPosition(frameInfo().currentPosition, kLocalBpmSpan);
if (!localBpm.isValid()) {
localBpm = pBeats->getBpm();
}
Expand All @@ -1097,7 +1091,7 @@ mixxx::Bpm BpmControl::updateLocalBpm() {
}

double BpmControl::updateBeatDistance() {
double beatDistance = getBeatDistance(getSampleOfTrack().current);
double beatDistance = getBeatDistance(frameInfo().currentPosition.toEngineSamplePos());
m_pThisBeatDistance->set(beatDistance);
if (!isSynchronized() && m_dUserOffset.getValue() != 0.0) {
m_dUserOffset.setValue(0.0);
Expand Down Expand Up @@ -1132,8 +1126,8 @@ void BpmControl::resetSyncAdjustment() {

void BpmControl::collectFeatures(GroupFeatureState* pGroupFeatures) const {
// Without a beatgrid we don't know any beat details.
SampleOfTrack sot = getSampleOfTrack();
if (sot.rate == 0 || !m_pBeats) {
FrameInfo info = frameInfo();
if (!info.sampleRate.isValid() || !m_pBeats) {
return;
}

Expand All @@ -1142,16 +1136,17 @@ void BpmControl::collectFeatures(GroupFeatureState* pGroupFeatures) const {
double dThisNextBeat = m_pNextBeat->get();
double dThisBeatLength;
double dThisBeatFraction;
if (getBeatContextNoLookup(sot.current,
dThisPrevBeat, dThisNextBeat,
&dThisBeatLength, &dThisBeatFraction)) {

if (getBeatContextNoLookup(info.currentPosition.toEngineSamplePos(),
dThisPrevBeat,
dThisNextBeat,
&dThisBeatLength,
&dThisBeatFraction)) {
// Note: dThisBeatLength is fractional frames count * 2 (stereo samples)
double sotPerSec = kSamplesPerFrame * sot.rate * m_pRateRatio->get();
if (sotPerSec != 0.0) {
pGroupFeatures->beat_length_sec = dThisBeatLength / sotPerSec;
double samplesPerSecond = kSamplesPerFrame * info.sampleRate * m_pRateRatio->get();
if (samplesPerSecond != 0.0) {
pGroupFeatures->beat_length_sec = dThisBeatLength / samplesPerSecond;
pGroupFeatures->has_beat_length_sec = true;
} else {
} else {
pGroupFeatures->has_beat_length_sec = false;
}

Expand Down