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

Compare commits

base: mahefa:37683fe94f406e2921451263b5f2d2d9caa16388
Branches Tags
mahefa:master
mahefa:v1.0.0
...
compare: mahefa:aaff6c0f98b62517416fc30045e46787cf2e5660
Branches Tags
mahefa:master
mahefa:v1.0.0

2 commits
37683fe94f ... aaff6c0f98

Author SHA1 Message Date
Hasinjato
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
Hasinjato
872e4d820d Put bpm from measure sign to "p" fallback 2026-10-05 09:48:44 +03:00
1 changed files with 1 additions and 1 deletions
Show stats Expand all files Collapse all files

2
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt
View file

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