diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-13 22:07:24 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2018-12-13 22:07:24 +0100 |
commit | 85a5a6c41a33c8493361158c598c7ea873230422 (patch) | |
tree | 4bd273471eb4c85ebbb1bd4f96053ad83f852ddf /src/vinylcontrol | |
parent | d97472ce42d08de31c36af229a7fcff55f110a98 (diff) | |
parent | 9f3b86ef353ee6741acf927a38f64b4d525a1e37 (diff) |
Merge remote-tracking branch 'upstream/master' into rate_ratio
Conflicts:
src/engine/sync/synccontrol.cpp
Diffstat (limited to 'src/vinylcontrol')
-rw-r--r-- | src/vinylcontrol/vinylcontrolxwax.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp index 3aa0e9cf96..0904f64dc8 100644 --- a/src/vinylcontrol/vinylcontrolxwax.cpp +++ b/src/vinylcontrol/vinylcontrolxwax.cpp @@ -136,8 +136,8 @@ VinylControlXwax::VinylControlXwax(UserSettingsPointer pConfig, QString group) speed = 1.35; } - double latency = ControlObject::getControl( - ConfigKey("[Master]", "latency"))->get(); + double latency = ControlObject::get( + ConfigKey("[Master]", "latency")); if (latency <= 0 || latency > 200) { qDebug() << "Failed to get sane latency, assuming 20 as a reasonable value"; latency = 20; |