← Back to branch summary

~kabelfrickler/mixxx/modplug

« back to all changes in this revision

Viewing changes to mixxx/src/track/beatfactory.cpp

  • Committer: Stefan Nuernberger
  • Date: 2013-03-14 18:11:40 UTC
  • mfrom: (3292.1.40 trunk)
  • Revision ID: kabelfrickler@googlemail.com-20130314181140-3ilxtuq46sxpjqa2
merge with latest trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/track/beatfactory.cpp
37
37
    return BeatsPointer(pGrid, &BeatFactory::deleteBeats);
38
38
}
39
39
 
40
 
QString BeatFactory::getPreferredVersion(
41
 
    const bool bEnableFixedTempoCorrection,
42
 
    const bool bEnableOffsetCorrection,
43
 
    const int iMinBpm, const int iMaxBpm,
44
 
    const QHash<QString, QString> extraVersionInfo) {
 
40
// static
 
41
QString BeatFactory::getPreferredVersion(const bool bEnableFixedTempoCorrection) {
45
42
    if (bEnableFixedTempoCorrection) {
46
43
        return BEAT_GRID_2_VERSION;
47
44
    }
99
96
    const int iSampleRate, const int iTotalSamples,
100
97
    const int iMinBpm, const int iMaxBpm) {
101
98
 
102
 
    const QString version = getPreferredVersion(bEnableFixedTempoCorrection,
103
 
                                                bEnableOffsetCorrection,
104
 
                                                iMinBpm, iMaxBpm,
105
 
                                                extraVersionInfo);
 
99
    const QString version = getPreferredVersion(bEnableFixedTempoCorrection);
106
100
    const QString subVersion = getPreferredSubVersion(bEnableFixedTempoCorrection,
107
101
                                                      bEnableOffsetCorrection,
108
102
                                                      iMinBpm, iMaxBpm,