diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2021-03-09 12:38:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-09 12:38:36 +0100 |
commit | 7063a3fd5ef577164a3714176f7763d54a75733c (patch) | |
tree | 9517e5aa3b78ce099f57abc241d2bf1aae9a1d2d /src/track/beatfactory.h | |
parent | bfd167ca4be18fda4ba2044fb5544c4c5a6289b7 (diff) |
Use mixxx::audio::SampleRate when dealing with beats (#3671)
* Use mixxx::audio::SampleRate when dealing with beats
* Use a valid sample rate in tests
* Fix windows builds
Diffstat (limited to 'src/track/beatfactory.h')
-rw-r--r-- | src/track/beatfactory.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/track/beatfactory.h b/src/track/beatfactory.h index dda238bf4d..865dbeaaa0 100644 --- a/src/track/beatfactory.h +++ b/src/track/beatfactory.h @@ -9,31 +9,31 @@ class Track; class BeatFactory { public: static mixxx::BeatsPointer loadBeatsFromByteArray( - SINT sampleRat, + mixxx::audio::SampleRate sampleRate, const QString& beatsVersion, const QString& beatsSubVersion, const QByteArray& beatsSerialized); static mixxx::BeatsPointer makeBeatGrid( - SINT sampleRat, + mixxx::audio::SampleRate sampleRate, double dBpm, double dFirstBeatSample); - static QString getPreferredVersion(const bool bEnableFixedTempoCorrection); + static QString getPreferredVersion(bool bEnableFixedTempoCorrection); static QString getPreferredSubVersion( - const bool bEnableFixedTempoCorrection, - const bool bEnableOffsetCorrection, - const int iMinBpm, - const int iMaxBpm, + bool bEnableFixedTempoCorrection, + bool bEnableOffsetCorrection, + int iMinBpm, + int iMaxBpm, const QHash<QString, QString>& extraVersionInfo); static mixxx::BeatsPointer makePreferredBeats( const QVector<double>& beats, const QHash<QString, QString>& extraVersionInfo, - const bool bEnableFixedTempoCorrection, - const bool bEnableOffsetCorrection, - const int iSampleRate, - const int iTotalSamples, - const int iMinBpm, - const int iMaxBpm); + bool bEnableFixedTempoCorrection, + bool bEnableOffsetCorrection, + mixxx::audio::SampleRate iSampleRate, + SINT totalSamples, + int iMinBpm, + int iMaxBpm); }; |