Compare commits

...

2 commits

Author SHA1 Message Date
aaff6c0f98 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
2026-10-05 09:49:24 +03:00
872e4d820d Put bpm from measure sign to "p" fallback 2026-10-05 09:48:44 +03:00

View file

@ -2052,7 +2052,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
sharedScreenModel.setBpmFlow(meta["p"]?.toFloat() ?: 120.0f)
sharedScreenModel.setOptimColGrid(meta["k"]?.toIntOrNull() ?: 0)
val fallbackBpm = getBpmFromMeasure(meta["m"])
val bpm = meta["p"]?.toFloatOrNull() ?: fallb ackBpm
val bpm = meta["p"]?.toFloatOrNull() ?: fallbackBpm
sharedScreenModel.setBpmFlow(bpm)
}