diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt index 58b8459..f1ca430 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt @@ -219,6 +219,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository N.clear() L.clear() globalDComments.clear() + meta.clear() if (pitches.isNotEmpty()) { pitches[0].reset() } @@ -242,8 +243,6 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository parseOneLine(line) } } - val songBpm = meta["p"]?.toFloatOrNull() ?: 120f - sharedScreenModel.setBpmFlow(songBpm) unparsedNote.forEach { preloadN(it) } @@ -307,6 +306,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository T.clear() N.clear() L.clear() + meta.clear() globalDComments.clear() if (pitches.isNotEmpty()) { pitches[0].reset() @@ -2049,6 +2049,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository sharedScreenModel.setSongAuthor(meta["a"] ?: "") sharedScreenModel.setSongComposer(meta["h"] ?: "") sharedScreenModel.setSongRhythm(meta["r"] ?: "") + sharedScreenModel.setBpmFlow(meta["p"]?.toFloat() ?: 120.0f) } private fun loadN(voiceNumber: Int, line: String, templateComments: MutableList) {