Keep tempo on seekto grid 0
This commit is contained in:
parent
aaee37d7f7
commit
bcb21883c5
1 changed files with 2 additions and 8 deletions
|
|
@ -722,13 +722,7 @@ actual class FMediaPlayer actual constructor(
|
||||||
val tick = (gridIndex.toDouble() * resolution).toLong()
|
val tick = (gridIndex.toDouble() * resolution).toLong()
|
||||||
sequencer?.tickPosition = tick
|
sequencer?.tickPosition = tick
|
||||||
|
|
||||||
val initialOrPreviousBpm = navigationSteps
|
|
||||||
.filter { it.newBpm != null && it.gridIndex <= gridIndex }
|
|
||||||
.maxByOrNull { it.gridIndex }?.newBpm ?: 120f
|
|
||||||
|
|
||||||
targetBpm = initialOrPreviousBpm
|
|
||||||
applyBpm()
|
applyBpm()
|
||||||
sharedScreenModel.setBpmFlow(initialOrPreviousBpm)
|
|
||||||
// Voir les velocity avant
|
// Voir les velocity avant
|
||||||
val lastDynamic = navigationSteps
|
val lastDynamic = navigationSteps
|
||||||
.filter { it.dynamic != null && it.gridIndex <= gridIndex }
|
.filter { it.dynamic != null && it.gridIndex <= gridIndex }
|
||||||
|
|
@ -747,9 +741,9 @@ actual class FMediaPlayer actual constructor(
|
||||||
val currentTick = sequencer?.tickPosition ?: 0L
|
val currentTick = sequencer?.tickPosition ?: 0L
|
||||||
if (currentTick == 0L) {
|
if (currentTick == 0L) {
|
||||||
resetNavigationFlags()
|
resetNavigationFlags()
|
||||||
targetBpm = initialBpm
|
/*targetBpm = initialBpm
|
||||||
forceTempo(initialBpm.toDouble())
|
forceTempo(initialBpm.toDouble())
|
||||||
boundModel?.setBpmFlow(initialBpm)
|
boundModel?.setBpmFlow(initialBpm)*/
|
||||||
}
|
}
|
||||||
val countInEnable = prefs.getBoolean("isCountIn", true)
|
val countInEnable = prefs.getBoolean("isCountIn", true)
|
||||||
if (currentTick == 0L && countInEnable) {
|
if (currentTick == 0L && countInEnable) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue