From 92a3a0344df87a9b798403861264928f4cf777b5 Mon Sep 17 00:00:00 2001 From: Hasinjato Date: Fri, 7 Aug 2026 11:59:23 +0300 Subject: [PATCH] Settings: countIn control; key&time signature on midifile; MidiPlayer: support change tempo , modulation . Support minor key --- .../src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt | 2 +- .../src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt | 1 - .../src/commonMain/kotlin/mg/dot/feufaro/ui/Settings.kt | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) 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 83899eb..f8e6230 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Solfa.kt @@ -23,7 +23,7 @@ import kotlin.math.min //@todo: split voices (ffpm19/ews22) ${S:mfs} in N4:, idem ffpm-212 //@todo: ffpm-164.txt O10:s3:mflswss // alternative notes for stanza 3 only //@todo: ews-47.txt DS/$ + [12][3] -//@todo: ffpm-99-2.txt triolet.mid + triolet (m--) +//@todo: ffpm-99-2.txt triolet.mid + triolet (m--)-- //@todo: ffpm-657-1.txt ${m:4/4 Miadana kely} //@todo: ews-80.txt ${m:12/4} //@todo: ews-81.txt ${R=}${D:....} diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt index ebea0e8..2bd64ba 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt @@ -254,7 +254,6 @@ fun MainScreenWithDrawer( if (showSettingsDialog) { Settings( sharedScreenModel = sharedScreenModel, - solfaScreenModel, onDismissRequest = { showSettingsDialog = false }, diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/Settings.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/Settings.kt index 7a1d09a..7ea93f6 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/Settings.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/Settings.kt @@ -38,7 +38,6 @@ import mg.dot.feufaro.getPlatform import mg.dot.feufaro.midi.Dynamic import mg.dot.feufaro.midi.MidiInstrument import mg.dot.feufaro.provideSettings -import mg.dot.feufaro.viewmodel.SolfaScreenModel import org.jetbrains.compose.resources.Font import org.koin.compose.koinInject @@ -46,7 +45,6 @@ import org.koin.compose.koinInject @Composable fun Settings( sharedScreenModel: SharedScreenModel, - solfaScreenModel: SolfaScreenModel, onDismissRequest: () -> Unit, expandedDropdownN: Boolean, isAndroid: Boolean @@ -664,8 +662,6 @@ fun Settings( onClick = { globalInstrumentProgram = instrument.program sharedScreenModel.saveVoiceInstrument(instrument.program) - solfaScreenModel.regenMidi(120.0f) - sharedScreenModel.loadNewSong("whawyd3.mid") expandedDropdown = false }, leadingIcon = {