summaryrefslogtreecommitdiffstats
path: root/src/engine/controls/bpmcontrol.h
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2020-02-20 01:19:53 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2020-02-20 01:19:53 +0100
commit00dd1d4ecf1be88a536dc9ea2baa8f20e4a1c868 (patch)
treec5ee5c4974dcb8e1c831af5dec1ace1aa9d74afb /src/engine/controls/bpmcontrol.h
parent48d46d4ce4cab5f5fd78c492093c625cadacdce1 (diff)
fix EngineSyncTest.HalfDoubleBpmTest
Diffstat (limited to 'src/engine/controls/bpmcontrol.h')
-rw-r--r--src/engine/controls/bpmcontrol.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/controls/bpmcontrol.h b/src/engine/controls/bpmcontrol.h
index 2ec5015694..48a3f062c5 100644
--- a/src/engine/controls/bpmcontrol.h
+++ b/src/engine/controls/bpmcontrol.h
@@ -31,7 +31,7 @@ class BpmControl : public EngineControl {
// that value is added to the rate by bpmcontrol. The rate may be
// further adjusted if bpmcontrol discovers that the tracks have fallen
// out of sync.
- double calcSyncedRate(double userTweak, double dThisPosition);
+ double calcSyncedRate(double userTweak);
// Get the phase offset from the specified position.
double getNearestPositionInPhase(double dThisPosition, bool respectLoops, bool playing);
double getBeatMatchPosition(double dThisPosition, bool respectLoops, bool playing);
@@ -72,6 +72,7 @@ class BpmControl : public EngineControl {
static double shortestPercentageChange(const double& current_percentage,
const double& target_percentage);
double getRateRatio() const;
+ void notifySeek(double dNewPlaypos) override;
void trackLoaded(TrackPointer pNewTrack) override;
private slots:
@@ -99,7 +100,7 @@ class BpmControl : public EngineControl {
return toSynchronized(getSyncMode());
}
bool syncTempo();
- double calcSyncAdjustment(double my_percentage, bool userTweakingSync);
+ double calcSyncAdjustment(bool userTweakingSync);
friend class SyncControl;