diff options
author | Owen Williams <owilliams@mixxx.org> | 2014-01-10 22:33:44 -0500 |
---|---|---|
committer | Owen Williams <owilliams@mixxx.org> | 2014-01-10 22:33:44 -0500 |
commit | 7c50246ce375161d7f4dcda2bc2cf5a58ebef970 (patch) | |
tree | 5a23c281f5c1165075e66d0a9dba467073c034df /src/vinylcontrol/vinylcontrolxwax.cpp | |
parent | bed60ca6d326a397fea175bbd0a75fe85989d7db (diff) |
Update xwax to 1.4, no major changes.
Diffstat (limited to 'src/vinylcontrol/vinylcontrolxwax.cpp')
-rw-r--r-- | src/vinylcontrol/vinylcontrolxwax.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp index 9456057681..dcb77a7455 100644 --- a/src/vinylcontrol/vinylcontrolxwax.cpp +++ b/src/vinylcontrol/vinylcontrolxwax.cpp @@ -147,7 +147,7 @@ VinylControlXwax::VinylControlXwax(ConfigObject<ConfigValue>* pConfig, QString g // do this once across the VinylControlXwax instances. s_xwaxLUTMutex.lock(); - timecoder_init(&timecoder, tc_def, speed, iSampleRate); + timecoder_init(&timecoder, tc_def, speed, iSampleRate, /* photo */ false); timecoder_monitor_init(&timecoder, MIXXX_VINYL_SCOPE_SIZE); //Note that timecoder_init will not double-malloc the LUTs, and after this we are guaranteed //that the LUT has been generated unless we ran out of memory. @@ -802,9 +802,7 @@ float VinylControlXwax::getAngle() { if (pos == -1) return -1.0; - pos /= 1000.0; - float rps = timecoder_revs_per_sec(&timecoder); //invert angle to make vinyl spin direction correct - return 360 - ((int)(pos * 360.0 * rps) % 360); + return 360 - ((int)(when * 360.0 * rps) % 360); } |