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

'<' '>' to transpose audio & chords; "Transpose to C": to convert note to C scale

Browse source
This commit is contained in:
Hasinjato 2026-08-17 15:38:29 +03:00
parent 88b734cdc2
commit 78876d7ec0
8 changed files with 156 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composeApp/src/commonMain/kotlin/mg/dot/feufaro/midi/MidiPitch.kt
View file

@ -32,7 +32,7 @@ data class MidiPitch (
metaType = type metaType = type
} }
fun setNote(note: String, theDuration: Int) { fun setNote(note: String, theDuration: Int) {
val midiPitch = Transpose.transposeToMidi(note, key, "C") val midiPitch = Transpose.transposeToMidi(note, "C", key)
velocity = if (midiPitch < 0) { velocity = if (midiPitch < 0) {
0 0
} else { } else {

8
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/HarmonicAnalyser.kt
View file

@ -102,17 +102,19 @@ object HarmonicAnalyzer {
return degreeLine return degreeLine
} }
fun analyzeChordName(notes: Map<Int, String>, songKey: String = "C"): String { fun analyzeChordName(notes: Map<Int, String>, songKey: String = "C", transposeInt: Int = 0): String {
val keyOffset = keyOffsets[songKey] ?: 0 val keyOffset = keyOffsets[songKey] ?: 0
val totalOffset = ((keyOffset + transposeInt) % 12 + 12) % 12
val slices = splitSlices(notes) val slices = splitSlices(notes)
val names = slices.map { slice -> val names = slices.map { slice ->
val cleaned = cleanNotes(slice) val cleaned = cleanNotes(slice)
val match = findChordMatch(cleaned) ?: return@map "" val match = findChordMatch(cleaned) ?: return@map ""
val absoluteRoot = (keyOffset + match.root) % 12
val absoluteRoot = ((totalOffset + match.root) % 12 + 12) % 12
val chordName = noteNames[absoluteRoot] + match.quality val chordName = noteNames[absoluteRoot] + match.quality
if (match.bass != -1 && match.bass != match.root) { if (match.bass != -1 && match.bass != match.root) {
val absoluteBass = (keyOffset + match.bass) % 12 val absoluteBass = ((totalOffset + match.bass) % 12 + 12) % 12
"$chordName/${noteNames[absoluteBass]}" "$chordName/${noteNames[absoluteBass]}"
} else { } else {
chordName chordName

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

@ -264,7 +264,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
private val prefs: Settings = provideSettings() private val prefs: Settings = provideSettings()
fun generateMidiFile(bpm: Float, outputPath: String = "whawyd3.mid") { fun generateMidiFile(bpm: Float, outputPath: String = "whawyd3.mid", transpI: Int = 0) {
val parseScope = CoroutineScope(Dispatchers.Default) val parseScope = CoroutineScope(Dispatchers.Default)
parseScope.launch { parseScope.launch {
val pitchesSorted = pitches.sortedWith(compareBy({ it.tick }, { it.voiceNumber })) val pitchesSorted = pitches.sortedWith(compareBy({ it.tick }, { it.voiceNumber }))
@ -276,12 +276,14 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
3 to prefs.getInt("voice_instrument", 0), 3 to prefs.getInt("voice_instrument", 0),
4 to prefs.getInt("voice_instrument", 0), 4 to prefs.getInt("voice_instrument", 0),
) )
val originalKey = sharedScreenModel.songKey.value
val transposedKey = Transpose.transposeKey(baseKey = originalKey, interval = transpI)
midiWriter.process( midiWriter.process(
pitchesSorted, pitchesSorted,
sharedScreenModel.getFullMarkers(), sharedScreenModel.getFullMarkers(),
initialBpm = bpm, initialBpm = bpm,
instruments, instruments,
initialKey = sharedScreenModel.songKey.value initialKey = transposedKey
) )
midiWriter.save(outputPath) midiWriter.save(outputPath)
} }
@ -2086,7 +2088,12 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
midiPitch.currentVoiceNumber(voiceNumber) midiPitch.currentVoiceNumber(voiceNumber)
if (voiceNumber == 1) { if (voiceNumber == 1) {
midiPitch.initKey(meta["C"] ?: "C", meta["C"]?.endsWith("m") ?: false) val rawKey = sharedScreenModel.songKey.value.ifEmpty { meta["C"] ?: "C" }
val interval = sharedScreenModel.transpositionInterval.value
val isMinor = rawKey.endsWith("m", ignoreCase = true)
val transposedKey = Transpose.transposeKey(rawKey, interval)
midiPitch.initKey(transposedKey, isMinor)
pushMidi("meta") pushMidi("meta")
if (midiPitch.initMeasure(meta["m"] ?: "4/4")) { if (midiPitch.initMeasure(meta["m"] ?: "4/4")) {
pushMidi("measure") pushMidi("measure")

8
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/TimeUnitObject.kt
View file

@ -959,8 +959,10 @@ fun LazyVerticalGridTUO(
val degreeName = remember(chordMap) { val degreeName = remember(chordMap) {
if (chordMap.isNotEmpty()) HarmonicAnalyzer.analyzeDegree(chordMap) else null if (chordMap.isNotEmpty()) HarmonicAnalyzer.analyzeDegree(chordMap) else null
} }
val chordName = remember(chordMap) { val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState()
if (chordMap.isNotEmpty()) HarmonicAnalyzer.analyzeChordName(chordMap, sharedScreenModel.songKey.value) else null val songKey = sharedScreenModel.songKey.value
val chordName = remember(chordMap, songKey, appliedInterval) {
if (chordMap.isNotEmpty()) HarmonicAnalyzer.analyzeChordName(chordMap, songKey, appliedInterval) else null
} }
Column( Column(
@ -1104,7 +1106,7 @@ fun LazyVerticalGridTUO(
) )
} }
) { ) {
val currentInterval by sharedScreenModel.transpositionInterval.collectAsState() val currentInterval by sharedScreenModel.transpToCInt.collectAsState()
TimeUnitComposable( TimeUnitComposable(
tuo = oneTUO, tuo = oneTUO,
stanzaNumber = currentStanza, stanzaNumber = currentStanza,

71
composeApp/src/commonMain/kotlin/mg/dot/feufaro/solfa/Transpose.kt
View file

@ -200,22 +200,81 @@ class Transpose {
return note return note
} }
val noteNaked = regexFound.groupValues[1] val noteNaked = regexFound.groupValues[1]
val originalOctaveStr = regexFound.groupValues[2]
val rest = regexFound.groupValues[3]
val noteNum = noteToNumber.indexOf(noteNaked) val noteNum = noteToNumber.indexOf(noteNaked)
val oldKey = keyToNumber.indexOf(fromKey) val oldKey = keyToNumber.indexOf(fromKey)
val newKey = keyToNumber.indexOf(toKey) val newKey = keyToNumber.indexOf(toKey)
var newNoteNum = noteNum - newKey + oldKey + alter if (oldKey == -1 || newKey == -1) return note
var suffix = ""
var keyShift = newKey - oldKey
if (keyShift > 6) {
keyShift -= 12
} else if (keyShift < -6) {
keyShift += 12
}
var newNoteNum = noteNum + keyShift + alter
var octaveShift = 0
val noteSize = noteToNumber.size val noteSize = noteToNumber.size
while (newNoteNum < 0) { while (newNoteNum < 0) {
newNoteNum += noteSize newNoteNum += noteSize
suffix += "," octaveShift -= 1
} }
while (newNoteNum >= noteSize) { while (newNoteNum >= noteSize) {
newNoteNum -= noteSize newNoteNum -= noteSize
suffix += "'" octaveShift += 1
} }
val newNote = noteToNumber[newNoteNum] + regexFound.groupValues[2] + suffix
return simplifyNote(newNote) + regexFound.groupValues[3] val originalOctaveVal = octaveToInt(originalOctaveStr)
val finalOctaveVal = originalOctaveVal + octaveShift
val finalOctaveStr = intToOctave(finalOctaveVal)
val transposedNote = noteToNumber[newNoteNum]
return transposedNote + finalOctaveStr + rest
}
fun octaveToInt(octaveStr: String): Int {
var valOctave = 0
for (char in octaveStr) {
when (char) {
'\'', '¹' -> valOctave += 1
',', '₁' -> valOctave -= 1
'²' -> valOctave += 2
'₂' -> valOctave -= 2
'³' -> valOctave += 3
'₃' -> valOctave -= 3
'⁴' -> valOctave += 4
'₄' -> valOctave -= 4
}
}
return valOctave
}
fun intToOctave(octaveVal: Int): String {
val index = octaveVal + 4
return if (index in octaveSigns.indices) {
octaveSigns[index]
} else if (octaveVal > 0) {
"'".repeat(octaveVal)
} else if (octaveVal < 0) {
",".repeat(-octaveVal)
} else {
""
}
}
fun transposeKey(baseKey: String, interval: Int): String {
if (baseKey.isBlank()) return "C"
val isMinor = baseKey.endsWith("m", ignoreCase = true)
val rootKey = if (isMinor) baseKey.dropLast(1) else baseKey
val baseIndex = keyToNumber.indexOfFirst { it.equals(rootKey, ignoreCase = true) }
if (baseIndex == -1) return baseKey
val newIndex = (baseIndex + interval).mod(12)
val newRootKey = keyToNumber[newIndex]
return if (isMinor) "${newRootKey}m" else newRootKey
} }
@OptIn(ExperimentalMaterial3Api::class) // Ajoutez cette annotation pour utiliser ExposedDropdownMenuBox @OptIn(ExperimentalMaterial3Api::class) // Ajoutez cette annotation pour utiliser ExposedDropdownMenuBox
@Composable @Composable

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

@ -468,7 +468,8 @@ fun MainScreenWithDrawer(
} }
} }
}, actions = { }, actions = {
var tempInterval by remember(fileContent) { mutableStateOf(0) } val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState()
var tempInterval by remember(fileContent, appliedInterval) { mutableStateOf(appliedInterval) }
var isEyeVisible by remember { mutableStateOf(false) } var isEyeVisible by remember { mutableStateOf(false) }
val isMinor = songKey.endsWith("m", ignoreCase = true) val isMinor = songKey.endsWith("m", ignoreCase = true)
val cleanSongKey = if (isMinor) songKey.dropLast(1) else songKey val cleanSongKey = if (isMinor) songKey.dropLast(1) else songKey
@ -476,10 +477,9 @@ fun MainScreenWithDrawer(
val songKeyIndex = keysOrder.indexOf(cleanSongKey).takeIf { it != -1 } ?: 0 val songKeyIndex = keysOrder.indexOf(cleanSongKey).takeIf { it != -1 } ?: 0
val rawKeyIndex = (songKeyIndex + tempInterval) % 12 val rawKeyIndex = (songKeyIndex + tempInterval) % 12
val tempUiKey = keysOrder[if (rawKeyIndex < 0) rawKeyIndex + 12 else rawKeyIndex] val tempUiKey = keysOrder[if (rawKeyIndex < 0) rawKeyIndex + 12 else rawKeyIndex]
val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState()
val isPendingChange = tempInterval != appliedInterval val isPendingChange = tempInterval != appliedInterval
val isCurrentlyTransposed = appliedInterval != 0 val isCurrentlyTransposed = appliedInterval != 0
val formattedKey = if (isMinor) "${tempUiKey}m" else tempUiKey
Box( Box(
modifier = Modifier.padding(end = 16.dp), modifier = Modifier.padding(end = 16.dp),
contentAlignment = Alignment.TopCenter contentAlignment = Alignment.TopCenter
@ -489,11 +489,11 @@ fun MainScreenWithDrawer(
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
Text( Text(
text = if(isMinor) "${tempUiKey}m" else tempUiKey, text = formattedKey,
style = MaterialTheme.typography.displaySmall, style = MaterialTheme.typography.displaySmall,
fontWeight = FontWeight.Black, fontWeight = FontWeight.Black,
textAlign = TextAlign.Center, textAlign = TextAlign.Center,
color = if (isCurrentlyTransposed && !isPendingChange) Color(0xFFFFD700) else Color.White, color = if (isCurrentlyTransposed || isPendingChange) MaterialTheme.colorScheme.tertiary else Color.White,
modifier = Modifier modifier = Modifier
.clickable( .clickable(
interactionSource = sharedInteractionSource, interactionSource = sharedInteractionSource,
@ -507,7 +507,10 @@ fun MainScreenWithDrawer(
DropdownMenu( DropdownMenu(
expanded = isEyeVisible, expanded = isEyeVisible,
onDismissRequest = { isEyeVisible = false }, onDismissRequest = {
tempInterval = appliedInterval
isEyeVisible = false
},
containerColor = Color(0xFF2C3135).copy(alpha = 0.75f), containerColor = Color(0xFF2C3135).copy(alpha = 0.75f),
shape = RoundedCornerShape(16.dp), shape = RoundedCornerShape(16.dp),
modifier = Modifier.padding(12.dp) modifier = Modifier.padding(12.dp)
@ -517,6 +520,8 @@ fun MainScreenWithDrawer(
verticalArrangement = Arrangement.spacedBy(8.dp) verticalArrangement = Arrangement.spacedBy(8.dp)
) { ) {
/* < = > */ /* < = > */
val isOriginalKeyC = cleanSongKey.equals("C", ignoreCase = true)
val isTransposedToC = tempUiKey.equals("C", ignoreCase = true) && !isOriginalKeyC
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceEvenly, horizontalArrangement = Arrangement.SpaceEvenly,
@ -549,11 +554,11 @@ fun MainScreenWithDrawer(
} }
val centralIcon = val centralIcon =
if (isPendingChange) Icons.Filled.Check else Icons.Filled.SwapHoriz if (isPendingChange && !isTransposedToC) Icons.Filled.Check else Icons.Filled.SwapHoriz
val centralTint = val centralTint =
if (isPendingChange) MaterialTheme.colorScheme.tertiary else Color.White if (isPendingChange) MaterialTheme.colorScheme.tertiary else Color.White
val tooltipText = val tooltipText =
if (isPendingChange) "Transposer en $tempUiKey" else if (isCurrentlyTransposed) "Revenir en $songKey" else "Transposer" if (isPendingChange) "Écoutez en $tempUiKey" else if (isCurrentlyTransposed) "Revenir en $songKey" else ""
TooltipBox( TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(), positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
@ -568,13 +573,18 @@ fun MainScreenWithDrawer(
IconButton( IconButton(
modifier = Modifier.size(36.dp), modifier = Modifier.size(36.dp),
onClick = { onClick = {
if (!isPendingChange && isCurrentlyTransposed) { if (isPendingChange) {
sharedScreenModel.setTranspositionInterval(tempInterval)
sharedScreenModel.stopMidi()
sharedScreenModel.seekTo(0f)
solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value)
} else if (isCurrentlyTransposed) {
tempInterval = 0 tempInterval = 0
sharedScreenModel.setTranspositionInterval(0) sharedScreenModel.setTranspositionInterval(0)
} else { sharedScreenModel.stopMidi()
sharedScreenModel.setTranspositionInterval(tempInterval) sharedScreenModel.seekTo(0f)
}
solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value) solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value)
}
isEyeVisible = false isEyeVisible = false
} }
) { ) {
@ -613,22 +623,35 @@ fun MainScreenWithDrawer(
val cIndex = keysOrder.indexOf("C") val cIndex = keysOrder.indexOf("C")
val intervalToC = if (cIndex != -1) cIndex - songKeyIndex else 0 val intervalToC = if (cIndex != -1) cIndex - songKeyIndex else 0
val buttonText = if (isTransposedToC) "Revenir en $songKey" else "Transposer en C"
val tooltipTextC = if (isTransposedToC) "Revenir en clé $songKey" else "Écrire les notes en Do (C)"
TooltipBox( TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(), positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
tooltip = { tooltip = {
PlainTooltip( PlainTooltip(
containerColor = Color.DarkGray, containerColor = Color.DarkGray,
contentColor = Color.White contentColor = Color.White
) { Text(text = "Transposer en Do (C)", fontSize = 12.sp) } ) { Text(text = tooltipTextC, fontSize = 12.sp) }
}, },
state = rememberTooltipState() state = rememberTooltipState()
) { ) {
OutlinedButton( OutlinedButton(
onClick = { onClick = {
tempInterval = intervalToC if (isTransposedToC) {
sharedScreenModel.setTranspositionInterval(intervalToC) tempInterval = 0
solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value) sharedScreenModel.setTranspositionInterval(0)
sharedScreenModel.setTranspToC(0)
sharedScreenModel.stopMidi()
sharedScreenModel.seekTo(0f)
} else {
val currentKey = sharedScreenModel.songKey.value
val intervalC = getIntervalToC(currentKey)
tempInterval = -intervalC
sharedScreenModel.setTranspToC(intervalC)
sharedScreenModel.stopMidi()
sharedScreenModel.seekTo(0f)
}
isEyeVisible = false isEyeVisible = false
}, },
modifier = Modifier.fillMaxWidth().height(36.dp), modifier = Modifier.fillMaxWidth().height(36.dp),
@ -642,7 +665,7 @@ fun MainScreenWithDrawer(
) )
) { ) {
Text( Text(
text = "Transposer en C", text = buttonText,
fontSize = 12.sp, fontSize = 12.sp,
fontWeight = FontWeight.Bold fontWeight = FontWeight.Bold
) )
@ -799,9 +822,10 @@ fun MainScreenWithDrawer(
) )
if (!savedPath.isNullOrEmpty()) { if (!savedPath.isNullOrEmpty()) {
val transpositionInterval = sharedScreenModel.transpositionInterval.value
val bpm = sharedScreenModel.getBpmFlow().value ?: 120f val bpm = sharedScreenModel.getBpmFlow().value ?: 120f
solfaScreenModel.generateMidiFile(bpm, savedPath) solfaScreenModel.generateMidiFile(bpm, savedPath, transpositionInterval)
println("Fichier MIDI enregistré avec succès sous : $savedPath") println("Fichier MIDI enregistré avec succès sous : $savedPath")
} }
} catch (e: Exception) { } catch (e: Exception) {
@ -1138,6 +1162,24 @@ fun MainScreenWithDrawer(
} }
}) })
} }
private fun getIntervalToC(key: String): Int {
val cleanKey = key.removeSuffix("m").trim().uppercase()
return when (cleanKey) {
"C" -> 0
"DB" -> 1
"D" -> 2
"EB" -> 3
"E" -> 4
"F" -> 5
"GB" -> 6
"G" -> 7
"AB" -> 8
"A" -> 9
"BB" -> 10
"B" -> 11
else -> 0
}
}
@Composable @Composable
private fun MyFAB( private fun MyFAB(

6
composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SharedScreenModel.kt
View file

@ -290,6 +290,11 @@ class SharedScreenModel(private val fileRepository: FileRepository) : ScreenMode
transpositionInterval.value = interval transpositionInterval.value = interval
} }
val transpToCInt = MutableStateFlow(0)
fun setTranspToC(count: Int) {
transpToCInt.value = count
}
private val _synchronizedSYllables = MutableStateFlow<List<String>>(emptyList()) private val _synchronizedSYllables = MutableStateFlow<List<String>>(emptyList())
val synchronizedSyllables: StateFlow<List<String>> = _synchronizedSYllables.asStateFlow() val synchronizedSyllables: StateFlow<List<String>> = _synchronizedSYllables.asStateFlow()
@ -728,6 +733,7 @@ class SharedScreenModel(private val fileRepository: FileRepository) : ScreenMode
_sourceModeState.value = false _sourceModeState.value = false
_harmonyView.value = false _harmonyView.value = false
setTranspositionInterval(0) setTranspositionInterval(0)
setTranspToC(0)
setSilentDurBefr(0) setSilentDurBefr(0)
_midiMarkersList.value = emptyList() _midiMarkersList.value = emptyList()
_tuoTimestamps.value = emptyList() _tuoTimestamps.value = emptyList()

4
composeApp/src/commonMain/kotlin/mg/dot/feufaro/viewmodel/SolfaScreenModel.kt
View file

@ -55,7 +55,7 @@ class SolfaScreenModel(
solfa.createNewSolfa(metadata) solfa.createNewSolfa(metadata)
} }
} }
fun generateMidiFile(bpm: Float, path: String) { fun generateMidiFile(bpm: Float, path: String, transpI: Int) {
solfa.generateMidiFile(bpm, path) solfa.generateMidiFile(bpm, path, transpI)
} }
} }