diff --git a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt index 6090df4..c462856 100644 --- a/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt +++ b/composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt @@ -441,8 +441,7 @@ class SharedScreenModel(private val fileRepository: FileRepository) : ScreenMode val isDC = markerText.contains(Regex("""D\.?C\.?""")) val isDS = markerText.contains(Regex("""D\.?S\.?""")) - val isFarany = markerText.trim().equals("Farany", ignoreCase = true) - + val isFarany = markerText.trim().contains(Regex("""^(fine|fin|farany|end)$""", RegexOption.IGNORE_CASE)) val isRit = Regex("""rit\.?|ritard\.?|ritenuto\.?|ritardando""", RegexOption.IGNORE_CASE) var resultMarker: MidiMarkers = marker diff --git a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt index b183296..7a8a912 100644 --- a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt +++ b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/midi/MidiPlayer.kt @@ -735,23 +735,6 @@ actual class FMediaPlayer actual constructor( // println("Note detectée au grille: ${tick/60} -> Temps: ${microsecond / 1000} ms") } - // Détection de tous les note y compris les /2 /4 temps - /*val processedTicks = mutableSetOf() - - for (track in sequence.tracks) { - for (i in 0 until track.size()) { - val event = track.get(i) - val message = event.message - if (message is ShortMessage *//*&& message.command == ShortMessage.NOTE_ON *//*&& message.data2 > 0) { - if (!processedTicks.contains(event.tick)) { - val microsecond = (event.tick * usPerTick).toLong() - timestamps.add(microsecond) - processedTicks.add(event.tick) - println("Note detectée au Tick: ${event.tick} -> Temps: ${microsecond / 1000} ms") - } - } - } - }*/ val sortedList = timestamps.sorted() sharedScreenModel.updateTimestamps(sortedList) // println("SUR tempo $targetBpm Synchronization terminer et mis à jour") @@ -788,16 +771,6 @@ actual class FMediaPlayer actual constructor( try { this.currentGlobalVolume = level applyVoiceStates() - /*val volumeInt = (level * 127).toInt().coerceIn(0, 127) - - synthetizer?.channels?.forEachIndexed { index, channel -> - if (index < 4) { - val vol = if (voiceVolumes[index] != 0f) volumeInt else 0 - channel?.controlChange(7, vol) - } else { - channel?.controlChange(7, volumeInt) - } - }*/ val mixer = AudioSystem.getMixer(null) val lines = mixer.sourceLines for (line in lines) { @@ -874,14 +847,6 @@ actual class FMediaPlayer actual constructor( channels[i].controlChange(11, finalVol) if (finalVol == 0) channels[i].controlChange(123, 0) - /*val targetVolume = voiceVolumes[i].toInt() - - channels[i].controlChange(7, targetVolume) - channels[i].controlChange(11, targetVolume) - - if (targetVolume == 0) { - channels[i].controlChange(123, 0) - }*/ } // println("SATB $i Volumes: ${voiceVolumes[i]}") }