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

Settings: countIn control; key&time signature on midifile; MidiPlayer: support change tempo , modulation . Support minor key

Browse source
This commit is contained in:
Hasinjato 2026-08-07 11:59:23 +03:00
parent b38bfebfe6
commit 92a3a0344d
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import kotlin.math.min
//@todo: split voices (ffpm19/ews22) ${S:mfs} in N4:, idem ffpm-212 //@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: ffpm-164.txt O10:s3:mflswss // alternative notes for stanza 3 only
//@todo: ews-47.txt DS/$ + [12][3] //@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: ffpm-657-1.txt ${m:4/4 Miadana kely}
//@todo: ews-80.txt ${m:12/4} //@todo: ews-80.txt ${m:12/4}
//@todo: ews-81.txt ${R=}${D:....} //@todo: ews-81.txt ${R=}${D:....}

1
composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/DrawerUI.kt
View file

@ -254,7 +254,6 @@ fun MainScreenWithDrawer(
if (showSettingsDialog) { if (showSettingsDialog) {
Settings( Settings(
sharedScreenModel = sharedScreenModel, sharedScreenModel = sharedScreenModel,
solfaScreenModel,
onDismissRequest = { onDismissRequest = {
showSettingsDialog = false showSettingsDialog = false
}, },

4
composeApp/src/commonMain/kotlin/mg/dot/feufaro/ui/Settings.kt
View file

@ -38,7 +38,6 @@ import mg.dot.feufaro.getPlatform
import mg.dot.feufaro.midi.Dynamic import mg.dot.feufaro.midi.Dynamic
import mg.dot.feufaro.midi.MidiInstrument import mg.dot.feufaro.midi.MidiInstrument
import mg.dot.feufaro.provideSettings import mg.dot.feufaro.provideSettings
import mg.dot.feufaro.viewmodel.SolfaScreenModel
import org.jetbrains.compose.resources.Font import org.jetbrains.compose.resources.Font
import org.koin.compose.koinInject import org.koin.compose.koinInject
@ -46,7 +45,6 @@ import org.koin.compose.koinInject
@Composable @Composable
fun Settings( fun Settings(
sharedScreenModel: SharedScreenModel, sharedScreenModel: SharedScreenModel,
solfaScreenModel: SolfaScreenModel,
onDismissRequest: () -> Unit, onDismissRequest: () -> Unit,
expandedDropdownN: Boolean, expandedDropdownN: Boolean,
isAndroid: Boolean isAndroid: Boolean
@ -664,8 +662,6 @@ fun Settings(
onClick = { onClick = {
globalInstrumentProgram = instrument.program globalInstrumentProgram = instrument.program
sharedScreenModel.saveVoiceInstrument(instrument.program) sharedScreenModel.saveVoiceInstrument(instrument.program)
solfaScreenModel.regenMidi(120.0f)
sharedScreenModel.loadNewSong("whawyd3.mid")
expandedDropdown = false expandedDropdown = false
}, },
leadingIcon = { leadingIcon = {