mahefa/feufaro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix! grid idx handling to prevent activeIdx reset to 0 on midiPlaying - Android

Browse source
This commit is contained in:
Hasinjato 2026-08-17 09:54:32 +03:00
parent 640be8edb5
commit 8b171fceaf
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
composeApp/src/androidMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
View file

@ -424,11 +424,11 @@ actual class FMediaPlayer actual constructor(
} }
} }
} }
val currentGrid = (currentTickPos / resolution).toLong() val currentGrid = (currentTickPos / resolution).toLong()
if (boundModel?.activeIndex?.value != currentGrid.toInt()) { if (boundModel?.activeIndex?.value != currentGrid.toInt()) {
boundModel?.updateActiveIndex(currentGrid) boundModel?.updateActiveIndexByIndex(currentGrid.toInt())
} }
//println("C= ${currentGrid.toInt()} et shrd ${boundModel?.activeIndex?.value}")
idx++ idx++
} }
} }
@ -802,13 +802,18 @@ actual class FMediaPlayer actual constructor(
private fun startSyncLoop(sharedScreenModel: SharedScreenModel) { private fun startSyncLoop(sharedScreenModel: SharedScreenModel) {
syncJob?.cancel() syncJob?.cancel()
syncJob = playerScope.launch(Dispatchers.Default) { syncJob = playerScope.launch(Dispatchers.Default) {
var lastSentGrid = -1
while (isActive) { while (isActive) {
if (isRunning && !isHolding) { if (isRunning && !isHolding) {
val elapsedNano = System.nanoTime() - lastEventNano val elapsedNano = System.nanoTime() - lastEventNano
val extraTicks = (elapsedNano / (usPerTick * 1000)).toLong().coerceAtLeast(0L) val extraTicks = (elapsedNano / (usPerTick * 1000)).toLong().coerceAtLeast(0L)
val interpolated = (currentTickPos + extraTicks) / resolution val interpolated = (currentTickPos + extraTicks) / resolution
val rawGrid = interpolated.toInt().coerceAtLeast(0) val rawGrid = interpolated.toInt().coerceAtLeast(0)
sharedScreenModel.updateActiveIndexByIndex(rawGrid) //sharedScreenModel.updateActiveIndexByIndex(rawGrid)
if (interpolated.toInt() >= lastSentGrid) {
lastSentGrid = interpolated.toInt()
sharedScreenModel.updateActiveIndexByIndex(interpolated.toInt())
}
} }
delay(16) delay(16)
} }