Rate ratio #1765
Rate ratio #1765
Conversation
src/engine/ratecontrol.cpp
Outdated
| this, SLOT(slotRateSliderChanged(double)), | ||
| Qt::DirectConnection); | ||
| m_pRateRange = new ControlPotmeter( | ||
| ConfigKey(group, "rateRange"), 0.01, 0.90); |
There was a problem hiding this comment.
Change this to 0.01, 4.00 please, in keeping with #1662.
There was a problem hiding this comment.
Sure, this will happen automatically when merging 2.1 to master.
|
I haven't looked this over completely yet, but can you post here what will be in the MixxxControls wiki for rate_ratio? Its name doesn't clearly intimate what it does or how it's supposed to be used. |
|
rate_ratio is the unscaled ratio between the original rate (Speed) and the current rate. It is 1.0 if the track plays at original rate. |
|
It matches also the mpris definition of rate |
|
Is there a use case for this CO for skin or controller authors, or is it only internal usage? I would prefer we do not make it a public CO and keep it as an implementation detail -- one risk is that we could produce feedback loops between the 4 COs. |
|
The case is to provide a easy to use CO for script calculations, that does not depend on user settings. |
Conflicts: src/engine/sync/synccontrol.cpp
Conflicts: src/engine/bpmcontrol.cpp src/engine/keycontrol.cpp src/engine/keycontrol.h src/engine/ratecontrol.cpp
|
I have now added the follow up commits, to show how useful the new rate_ration CO is. |
Conflicts: src/engine/bpmcontrol.cpp src/engine/ratecontrol.cpp src/engine/ratecontrol.h
|
There are some merge conflicts now. Could you fix those? |
Conflicts: src/engine/controls/bpmcontrol.cpp src/engine/controls/keycontrol.cpp src/engine/sync/synccontrol.cpp src/widget/wnumberrate.cpp
Conflicts: src/engine/controls/ratecontrol.cpp src/engine/controls/ratecontrol.h src/engine/sync/synccontrol.cpp src/test/enginesynctest.cpp
|
This is again merge-able. |
src/engine/controls/bpmcontrol.cpp
Outdated
| @@ -873,14 +849,9 @@ void BpmControl::collectFeatures(GroupFeatureState* pGroupFeatures) const { | |||
|
|
|||
| // Note: dThisBeatLength is fractional frames count * 2 (stereo samples) | |||
| pGroupFeatures->beat_length_sec = dThisBeatLength / kSamplesPerFrame | |||
| / sot.rate / calcRateRatio(); | |||
| / sot.rate / m_pRateRatio->get(); | |||
There was a problem hiding this comment.
Without the lower bound of 1e-6 in calcRateRatio() this might now trigger a division-by-zero. Did you consider this edge case?
src/engine/controls/bpmcontrol.cpp
Outdated
| @@ -226,7 +222,7 @@ void BpmControl::slotTapFilter(double averageLength, int numSamples) { | |||
|
|
|||
| // (60 seconds per minute) * (1000 milliseconds per second) / (X millis per | |||
| // beat) = Y beats/minute | |||
| double averageBpm = 60.0 * 1000.0 / averageLength / calcRateRatio(); | |||
| double averageBpm = 60.0 * 1000.0 / averageLength / m_pRateRatio->get(); | |||
There was a problem hiding this comment.
Potential division-by-zero here, too
|
done |
|
This is again in a meregable state. |
|
@uklotzde: Can we merge this now? |
|
Sure, sorry for the delay. |
|
This has not been documented in the manual. |
This PR introduces the new control rate_ratio, which is 1.0 at normal speed.
This can is used by scripts and in various places in Mixxx and helped to remove code duplication, calculating it on the fly. Reduced by 146 Lines of code.
It decouples also the rate from the rate sider. This allows to introduce alternative rate control ideas.
For example:
https://bugs.launchpad.net/mixxx/+bug/1762172
Which makes the rateRange finally usable during a Gig.
This new concept also includes the feature that the rate-slider soed not go out of sync