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

Update metronome count-in by time measure

Browse source
This commit is contained in:
Hasinjato 2026-07-10 16:05:32 +03:00
parent 5f8e0e03a7
commit 2ec69a8b13
2 changed files with 73 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
composeApp/src/androidMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
View file

@ -680,18 +680,49 @@ actual class FMediaPlayer actual constructor(
else -> originalMeasure else -> originalMeasure
} }
val anacrouseBeats = nbSilent / 4 val anacrouseBeats = nbSilent / 4
val totalBeats = if (anacrouseBeats > 5) anacrouseBeats else adjustedMeasure + anacrouseBeats
// println("Android Décompte total : $totalBeats bips ($adjustedMeasure de préparation + $anacrouseBeats d'anacrouse) à $bpm BPM")
val noteOnEvent = byteArrayOf(0x99.toByte(), noteEvent.toByte(), velocity.toByte()) val noteOnEvent = byteArrayOf(0x99.toByte(), noteEvent.toByte(), velocity.toByte())
val noteOffEvent = byteArrayOf(0x89.toByte(), noteEvent.toByte(), 0.toByte()) val noteOffEvent = byteArrayOf(0x89.toByte(), noteEvent.toByte(), 0.toByte())
for (i in 1..totalBeats) { val noteOnSnare = byteArrayOf(0x99.toByte(), 38.toByte(), velocity.toByte())
midiDriver.write(noteOnEvent) val noteOffSnare = byteArrayOf(0x89.toByte(), 38.toByte(), 0.toByte())
delay(100)
midiDriver.write(noteOffEvent)
delay((beatDurationMs - 100).coerceAtLeast(0L)) val isEvenMeasure = adjustedMeasure in setOf(2, 4, 8)
if (isEvenMeasure) {
for (i in 1..2) {
midiDriver.write(noteOnEvent)
delay(100)
midiDriver.write(noteOffEvent)
val slowDuration = beatDurationMs * 2
delay((slowDuration - 100).coerceAtLeast(0L))
}
val remainingBeats = if (anacrouseBeats == 0) 4 else anacrouseBeats
for (i in 1..remainingBeats) {
val onBytes = if (i == remainingBeats) noteOnSnare else noteOnEvent
val offBytes = if (i == remainingBeats) noteOffSnare else noteOffEvent
midiDriver.write(onBytes)
delay(100)
midiDriver.write(offBytes)
delay((beatDurationMs - 100).coerceAtLeast(0L))
}
} else {
val totalBeats = if (anacrouseBeats > 5) anacrouseBeats else adjustedMeasure + anacrouseBeats
// println("Android dcompte total : $totalBeats bips ($adjustedMeasure de préparation + $anacrouseBeats d'anacrouse) à $bpm BPM")
for (i in 1..totalBeats) {
val onBytes = if (i == adjustedMeasure) noteOnSnare else noteOnEvent
val offBytes = if (i == adjustedMeasure) noteOffSnare else noteOffEvent
midiDriver.write(onBytes)
delay(100)
midiDriver.write(offBytes)
delay((beatDurationMs - 100).coerceAtLeast(0L))
}
} }
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
@ -780,11 +811,7 @@ actual class FMediaPlayer actual constructor(
} }
actual fun getVoiceVolumes(): List<Float> = voiceVolumes.toList() actual fun getVoiceVolumes(): List<Float> = voiceVolumes.toList()
actual fun changeInstru(noInstru: Int) { actual fun changeInstru(noInstru: Int) {
val buffer = byteArrayOf( for (ch in 0 until 4) send(0xC0 or ch, noInstru)
(0xC0 or 0).toByte(),
noInstru.toByte()
)
midiDriver.write(buffer)
} }
actual fun getAvalaibleInstruments(): List<MidiInstrument> { actual fun getAvalaibleInstruments(): List<MidiInstrument> {
val gmInstruments = listOf( val gmInstruments = listOf(

39
composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt
View file

@ -679,14 +679,41 @@ actual class FMediaPlayer actual constructor(
val anacrouseBeats = nbSilent / 4 val anacrouseBeats = nbSilent / 4
val totalBeats = if(anacrouseBeats > 5) anacrouseBeats else adjustedMeasure + anacrouseBeats val totalBeats = if(anacrouseBeats > 5) anacrouseBeats else adjustedMeasure + anacrouseBeats
// println("Décompte total : $totalBeats bips ($adjustedMeasure de préparation + $anacrouseBeats d'anacrouse [$nbSilent / $4 ]) à $bpm BPM") println("Décompte total : $totalBeats bips ($adjustedMeasure de préparation + $anacrouseBeats d'anacrouse [$nbSilent / $4 ]) à $bpm BPM")
for (i in 1..totalBeats) { val isEvenMeasure = adjustedMeasure in setOf(2, 4, 8)
metronomeChannel?.noteOn(noteEvent, velocity)
delay(100)
metronomeChannel?.noteOff(noteEvent)
delay((beatDurationMs - 100).coerceAtLeast(0L)) if (isEvenMeasure) {
for (i in 1..2) {
metronomeChannel?.noteOn(noteEvent, velocity)
delay(100)
metronomeChannel?.noteOff(noteEvent)
val slowDuration = beatDurationMs * 2
delay((slowDuration - 100).coerceAtLeast(0L))
}
val remainingBeats = if(anacrouseBeats == 0) 4 else anacrouseBeats
for (i in 1..remainingBeats) {
val currentNote = if (i == remainingBeats) 38 else noteEvent
metronomeChannel?.noteOn(currentNote, velocity)
delay(100)
metronomeChannel?.noteOff(currentNote)
delay((beatDurationMs - 100).coerceAtLeast(0L))
}
} else {
for (i in 1..totalBeats) {
val currentNote = if (i == adjustedMeasure) 38 else noteEvent
metronomeChannel?.noteOn(currentNote, velocity)
delay(100)
metronomeChannel?.noteOff(currentNote)
delay((beatDurationMs - 100).coerceAtLeast(0L))
}
} }
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {