Settings: countIn control; key&time signature on midifile; MidiPlayer: support change tempo , modulation . Support minor key
This commit is contained in:
parent
b38bfebfe6
commit
92a3a0344d
3 changed files with 1 additions and 6 deletions
|
|
@ -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:....}
|
||||
|
|
|
|||
|
|
@ -254,7 +254,6 @@ fun MainScreenWithDrawer(
|
|||
if (showSettingsDialog) {
|
||||
Settings(
|
||||
sharedScreenModel = sharedScreenModel,
|
||||
solfaScreenModel,
|
||||
onDismissRequest = {
|
||||
showSettingsDialog = false
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue