Compare commits
No commits in common. "78876d7ec0e72cd244813a9a98b9a4db7fc4c1c1" and "8b171fceaff75711b678018ebd62ecbc45e8b410" have entirely different histories.
78876d7ec0
...
8b171fceaf
13 changed files with 72 additions and 232 deletions
|
|
@ -181,8 +181,6 @@ actual class FMediaPlayer actual constructor(
|
|||
private val navigationSteps = mutableListOf<NavigationStep>()
|
||||
private val prefs: Settings = provideSettings()
|
||||
|
||||
|
||||
@Volatile private var userCustomTempo: Boolean = false
|
||||
init {
|
||||
midiDriver.start()
|
||||
loadVoiceVolumes()
|
||||
|
|
@ -198,9 +196,7 @@ actual class FMediaPlayer actual constructor(
|
|||
val usPerQuarter = ((md[0].toInt() and 0xFF) shl 16) or
|
||||
((md[1].toInt() and 0xFF) shl 8) or
|
||||
(md[2].toInt() and 0xFF)
|
||||
val parsedBpm = 60_000_000f / usPerQuarter
|
||||
targetBpm = parsedBpm
|
||||
initialBpm = parsedBpm
|
||||
targetBpm = 60_000_000f / usPerQuarter
|
||||
}
|
||||
|
||||
usPerTick = (60_000_000.0 / targetBpm) / resolution
|
||||
|
|
@ -296,10 +292,8 @@ actual class FMediaPlayer actual constructor(
|
|||
private fun resetTempoToInitial() {
|
||||
tempoChangeJob?.cancel()
|
||||
isInTempoChange = false
|
||||
//targetBpm = initialBpm
|
||||
userCustomTempo = false
|
||||
usPerTick = (60_000_000.0 / targetBpm.toDouble()) / resolution.toDouble()
|
||||
boundModel?.setBpmFlow(targetBpm)
|
||||
targetBpm = initialBpm
|
||||
boundModel?.setBpmFlow(initialBpm)
|
||||
}
|
||||
|
||||
private fun extractDynamic(marker: String) = Dynamic.entries.firstOrNull {
|
||||
|
|
@ -388,7 +382,6 @@ actual class FMediaPlayer actual constructor(
|
|||
} else {
|
||||
yield()
|
||||
}
|
||||
if (!isRunning || !isActive) break
|
||||
|
||||
currentTickPos = ev.tickAbsolute
|
||||
lastEventNano = System.nanoTime()
|
||||
|
|
@ -445,13 +438,9 @@ actual class FMediaPlayer actual constructor(
|
|||
currentTickPos = gridIndex.toLong() * resolution
|
||||
lastEventNano = System.nanoTime()
|
||||
|
||||
val initialOrPreviousBpm = if (userCustomTempo) {
|
||||
targetBpm
|
||||
} else {
|
||||
navigationSteps
|
||||
.filter { it.newBpm != null && it.gridIndex <= gridIndex }
|
||||
.maxByOrNull { it.gridIndex }?.newBpm ?: initialBpm
|
||||
}
|
||||
val initialOrPreviousBpm = navigationSteps
|
||||
.filter { it.newBpm != null && it.gridIndex <= gridIndex }
|
||||
.maxByOrNull { it.gridIndex }?.newBpm ?: initialBpm
|
||||
|
||||
targetBpm = initialOrPreviousBpm
|
||||
sharedScreenModel.setBpmFlow(initialOrPreviousBpm)
|
||||
|
|
@ -462,9 +451,6 @@ actual class FMediaPlayer actual constructor(
|
|||
navigationSteps.forEach { step ->
|
||||
if (step.gridIndex > gridIndex) {
|
||||
step.alreadyDone = false
|
||||
if (step.isFarany) {
|
||||
step.faranyActive = false
|
||||
}
|
||||
}
|
||||
}
|
||||
applyVoiceStates()
|
||||
|
|
@ -484,10 +470,7 @@ actual class FMediaPlayer actual constructor(
|
|||
}
|
||||
|
||||
private fun resetNavigationFlags() {
|
||||
navigationSteps.forEach {
|
||||
it.alreadyDone = false
|
||||
it.faranyActive = false
|
||||
}
|
||||
navigationSteps.forEach { it.alreadyDone = false }
|
||||
}
|
||||
|
||||
private fun prepareNavigation(sharedScreenModel: SharedScreenModel) {
|
||||
|
|
@ -612,12 +595,10 @@ actual class FMediaPlayer actual constructor(
|
|||
|
||||
// ── Farany ────────────────────────────────
|
||||
finReg.containsMatchIn(mTrim) -> {
|
||||
val hasDcOrDsAfter = metadataList.any { m ->
|
||||
(m.gridIndex ?: 0) > ci && m.marker.any { mk ->
|
||||
dcR.containsMatchIn(mk) || dsR.containsMatchIn(mk)
|
||||
}
|
||||
val hasDcAfter = metadataList.any { m ->
|
||||
(m.gridIndex ?: 0) > ci && m.marker.any { mk -> dcR.containsMatchIn(mk) }
|
||||
}
|
||||
if (hasDcOrDsAfter) {
|
||||
if (hasDcAfter) {
|
||||
navigationSteps.add(
|
||||
NavigationStep(
|
||||
marker,
|
||||
|
|
@ -710,14 +691,9 @@ actual class FMediaPlayer actual constructor(
|
|||
//♩
|
||||
step.newBpm != null -> {
|
||||
step.alreadyDone = true
|
||||
if (step.gridIndex == 0 && userCustomTempo) {
|
||||
|
||||
}
|
||||
else {
|
||||
println("Exécution changement de tempo : ${step.newBpm} BPM à la grille $currentIndex")
|
||||
targetBpm = step.newBpm
|
||||
sharedScreenModel.setBpmFlow(step.newBpm)
|
||||
}
|
||||
println("Exécution changement de tempo : ${step.newBpm} BPM à la grille $currentIndex")
|
||||
targetBpm = step.newBpm
|
||||
sharedScreenModel.setBpmFlow(step.newBpm)
|
||||
}
|
||||
|
||||
// Modulation
|
||||
|
|
@ -779,13 +755,9 @@ actual class FMediaPlayer actual constructor(
|
|||
step.isFarany -> {
|
||||
println("C Farany ok $step")
|
||||
if (pendingFin || step.faranyActive) {
|
||||
step.alreadyDone = true
|
||||
isRunning = false
|
||||
allNotesOff()
|
||||
playJob?.cancel()
|
||||
seekToGrid(0)
|
||||
boundModel?.updateActiveIndexByIndex(0)
|
||||
println("Farany activé → STOP à grille $currentIndex")
|
||||
isRunning = false
|
||||
allNotesOff()
|
||||
onFinished()
|
||||
return@collect
|
||||
} else {
|
||||
|
|
@ -838,7 +810,7 @@ actual class FMediaPlayer actual constructor(
|
|||
val interpolated = (currentTickPos + extraTicks) / resolution
|
||||
val rawGrid = interpolated.toInt().coerceAtLeast(0)
|
||||
//sharedScreenModel.updateActiveIndexByIndex(rawGrid)
|
||||
if (interpolated.toInt() != lastSentGrid) {
|
||||
if (interpolated.toInt() >= lastSentGrid) {
|
||||
lastSentGrid = interpolated.toInt()
|
||||
sharedScreenModel.updateActiveIndexByIndex(interpolated.toInt())
|
||||
}
|
||||
|
|
@ -950,9 +922,7 @@ actual class FMediaPlayer actual constructor(
|
|||
allNotesOff(); currentTickPos = 0L
|
||||
resetNavigationFlags(); navigationSteps.clear(); clearLoop()
|
||||
currentDynamicFactor = Dynamic.MF.factor
|
||||
//resetTempoToNormal()
|
||||
currentPlaybackBpm = targetBpm
|
||||
usPerTick = (60_000_000.0 / targetBpm.toDouble()) / resolution.toDouble()
|
||||
resetTempoToNormal()
|
||||
resetTempoToInitial()
|
||||
}
|
||||
actual fun release() {
|
||||
|
|
@ -973,9 +943,7 @@ actual class FMediaPlayer actual constructor(
|
|||
actual fun setTempo(bpm: Float) {
|
||||
targetBpm = bpm
|
||||
currentPlaybackBpm = bpm
|
||||
userCustomTempo = true
|
||||
usPerTick = (60_000_000.0 / bpm.toDouble()) / resolution.toDouble()
|
||||
boundModel?.setBpmFlow(bpm)
|
||||
boundModel?.let { prepareNavigation(it) }
|
||||
needsClockSync = true
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
M0:|c:G|m:6/4|r:P.M|t:FF 7 Tsy hainay ny hangina|a:Ramarolahy Aina Nirina Jaona|h:
|
||||
U0:zK:4C444C84444444C84C444C84444444C8${$}${Fiverenana}4444444444444444444444444444444444444444444${Farany}K4444444(444)84444444C84444444(444)8444444484${D.S.Fin}8
|
||||
U0:zK:4 C444 C84 444444 C84 C444 C84 444444 C8${$}4 ${x7} 444444${x0} K4 444444 (444)84 444444 C84 444444 (444)84 444444 84${D.S}8
|
||||
N1:s,mmfsls smsmfmrrd mrFmrsr #s,tmrdrtlss sm-3f#t,ls-4 ssrmfsls-4 s,m-3fls-ssfrdsmfmrd d4msmf--d d4mrdsf r4Fmrs--r trrrd#s,tls--
|
||||
N2:#f,sddrmRm sdddttsss sFdddtt sF6r,f sdstdrRmdrmddt--t-- dmdtdrdsdt-- dmrrdlsddttss T7llTl T7ll d7ttdt sl3F3r,m,f
|
||||
N3:#l,s5Fs ssmdrsffm dr7d4rdtt ssmfs--smfsmmr--f-- msmrmfsmmf-- msT'T'l'fmmsrsfm m4smsddrd m4sfmdd F4l'Fl'rrmr rF3rrdtdr
|
||||
N4:#r,sd6 s7dd ddllFss sr6ss sdmsd-- dmsddls--s-- ddmslt d3s--dmmfrs7d, d7f4 d7ff r'7s4 r'4r3slt
|
||||
Y1:Tsy hainay ny hangina/Ka tsy hankalaza ny Avo/Nameno fitahiana/Ka tsy mba namela ho lavo.${R=}Ka de_4ra ry Ray!_4/Sy saotra no\ atolotra\ Anao_4/ny fo_4tena fa_2ly loatra no entinay midera\ Anao./Ny sainay tsy ampy\ hahalala/Ny fatran’ny fitiavana_o/Ka raiso ry Tompo Malala/Ny fankasitrahana\ Anao (ry Ray).
|
||||
Y1:Tsy hainay ny hangina/Ka tsy hankalaza ny Avo/Nameno fitahiana/Ka tsy mba namela ho lavo.${R=}Ka de_4ra ry Ray!_5/Sy saotra no\ atolotra\ Anao_5/ny fo_4tena fa_2ly loatra no entinay midera\ Anao./Ny sainay tsy ampy\ hahalala/Ny fatran’ny fitiavana_o/Ka raiso ry Tompo Malala/Ny fankasitrahana\ Anao (ry Ray).
|
||||
Y2:Tsy hainay hadinoina/‘Lay fara-fitiavanao, Ray o!/Fa maty novonoina/Ny Zanakao hamonjy anay./
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ object ScreenSolfa : Screen {
|
|||
var showContextualMenu = false
|
||||
var viewportHeight by remember { mutableStateOf(0) }
|
||||
|
||||
var isScanning by remember { mutableStateOf(false) }
|
||||
var qrCodeResult by remember { mutableStateOf("Aucun code scanné") }
|
||||
LaunchedEffect(Unit) {
|
||||
DeepLinkHandler.onSongReceived = { content, filePath ->
|
||||
|
|
@ -87,6 +88,9 @@ object ScreenSolfa : Screen {
|
|||
solfaScreenModel,
|
||||
sharedScreenModel,
|
||||
qrCodeResult = qrCodeResult,
|
||||
onScannerButtonClick = {
|
||||
isScanning = true
|
||||
},
|
||||
solfaScrollState = scrollState
|
||||
) { paddingValues ->
|
||||
Box(
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ data class MidiPitch (
|
|||
metaType = type
|
||||
}
|
||||
fun setNote(note: String, theDuration: Int) {
|
||||
val midiPitch = Transpose.transposeToMidi(note, "C", key)
|
||||
val midiPitch = Transpose.transposeToMidi(note, key, "C")
|
||||
velocity = if (midiPitch < 0) {
|
||||
0
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -102,19 +102,17 @@ object HarmonicAnalyzer {
|
|||
return degreeLine
|
||||
}
|
||||
|
||||
fun analyzeChordName(notes: Map<Int, String>, songKey: String = "C", transposeInt: Int = 0): String {
|
||||
fun analyzeChordName(notes: Map<Int, String>, songKey: String = "C"): String {
|
||||
val keyOffset = keyOffsets[songKey] ?: 0
|
||||
val totalOffset = ((keyOffset + transposeInt) % 12 + 12) % 12
|
||||
val slices = splitSlices(notes)
|
||||
|
||||
val names = slices.map { slice ->
|
||||
val cleaned = cleanNotes(slice)
|
||||
val match = findChordMatch(cleaned) ?: return@map ""
|
||||
|
||||
val absoluteRoot = ((totalOffset + match.root) % 12 + 12) % 12
|
||||
val absoluteRoot = (keyOffset + match.root) % 12
|
||||
val chordName = noteNames[absoluteRoot] + match.quality
|
||||
if (match.bass != -1 && match.bass != match.root) {
|
||||
val absoluteBass = ((totalOffset + match.bass) % 12 + 12) % 12
|
||||
val absoluteBass = (keyOffset + match.bass) % 12
|
||||
"$chordName/${noteNames[absoluteBass]}"
|
||||
} else {
|
||||
chordName
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
|
|||
|
||||
private val prefs: Settings = provideSettings()
|
||||
|
||||
fun generateMidiFile(bpm: Float, outputPath: String = "whawyd3.mid", transpI: Int = 0) {
|
||||
fun generateMidiFile(bpm: Float, outputPath: String = "whawyd3.mid") {
|
||||
val parseScope = CoroutineScope(Dispatchers.Default)
|
||||
parseScope.launch {
|
||||
val pitchesSorted = pitches.sortedWith(compareBy({ it.tick }, { it.voiceNumber }))
|
||||
|
|
@ -276,14 +276,12 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
|
|||
3 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(
|
||||
pitchesSorted,
|
||||
sharedScreenModel.getFullMarkers(),
|
||||
initialBpm = bpm,
|
||||
instruments,
|
||||
initialKey = transposedKey
|
||||
initialKey = sharedScreenModel.songKey.value
|
||||
)
|
||||
midiWriter.save(outputPath)
|
||||
}
|
||||
|
|
@ -2088,12 +2086,7 @@ class Solfa(val sharedScreenModel: SharedScreenModel, private val fileRepository
|
|||
|
||||
midiPitch.currentVoiceNumber(voiceNumber)
|
||||
if (voiceNumber == 1) {
|
||||
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)
|
||||
midiPitch.initKey(meta["C"] ?: "C", meta["C"]?.endsWith("m") ?: false)
|
||||
pushMidi("meta")
|
||||
if (midiPitch.initMeasure(meta["m"] ?: "4/4")) {
|
||||
pushMidi("measure")
|
||||
|
|
|
|||
|
|
@ -959,10 +959,8 @@ fun LazyVerticalGridTUO(
|
|||
val degreeName = remember(chordMap) {
|
||||
if (chordMap.isNotEmpty()) HarmonicAnalyzer.analyzeDegree(chordMap) else null
|
||||
}
|
||||
val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState()
|
||||
val songKey = sharedScreenModel.songKey.value
|
||||
val chordName = remember(chordMap, songKey, appliedInterval) {
|
||||
if (chordMap.isNotEmpty()) HarmonicAnalyzer.analyzeChordName(chordMap, songKey, appliedInterval) else null
|
||||
val chordName = remember(chordMap) {
|
||||
if (chordMap.isNotEmpty()) HarmonicAnalyzer.analyzeChordName(chordMap, sharedScreenModel.songKey.value) else null
|
||||
}
|
||||
|
||||
Column(
|
||||
|
|
@ -1106,7 +1104,7 @@ fun LazyVerticalGridTUO(
|
|||
)
|
||||
}
|
||||
) {
|
||||
val currentInterval by sharedScreenModel.transpToCInt.collectAsState()
|
||||
val currentInterval by sharedScreenModel.transpositionInterval.collectAsState()
|
||||
TimeUnitComposable(
|
||||
tuo = oneTUO,
|
||||
stanzaNumber = currentStanza,
|
||||
|
|
|
|||
|
|
@ -200,81 +200,22 @@ class Transpose {
|
|||
return note
|
||||
}
|
||||
val noteNaked = regexFound.groupValues[1]
|
||||
val originalOctaveStr = regexFound.groupValues[2]
|
||||
val rest = regexFound.groupValues[3]
|
||||
val noteNum = noteToNumber.indexOf(noteNaked)
|
||||
val oldKey = keyToNumber.indexOf(fromKey)
|
||||
val newKey = keyToNumber.indexOf(toKey)
|
||||
if (oldKey == -1 || newKey == -1) return note
|
||||
|
||||
var keyShift = newKey - oldKey
|
||||
if (keyShift > 6) {
|
||||
keyShift -= 12
|
||||
} else if (keyShift < -6) {
|
||||
keyShift += 12
|
||||
}
|
||||
|
||||
var newNoteNum = noteNum + keyShift + alter
|
||||
var octaveShift = 0
|
||||
var newNoteNum = noteNum - newKey + oldKey + alter
|
||||
var suffix = ""
|
||||
val noteSize = noteToNumber.size
|
||||
|
||||
while (newNoteNum < 0) {
|
||||
newNoteNum += noteSize
|
||||
octaveShift -= 1
|
||||
newNoteNum += noteSize
|
||||
suffix += ","
|
||||
}
|
||||
while (newNoteNum >= noteSize) {
|
||||
newNoteNum -= noteSize
|
||||
octaveShift += 1
|
||||
suffix += "'"
|
||||
}
|
||||
|
||||
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
|
||||
val newNote = noteToNumber[newNoteNum] + regexFound.groupValues[2] + suffix
|
||||
return simplifyNote(newNote) + regexFound.groupValues[3]
|
||||
}
|
||||
@OptIn(ExperimentalMaterial3Api::class) // Ajoutez cette annotation pour utiliser ExposedDropdownMenuBox
|
||||
@Composable
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@ import androidx.compose.ui.text.style.TextOverflow
|
|||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
|
||||
import cafe.adriel.voyager.navigator.internal.BackHandler
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
|
|
@ -55,13 +53,13 @@ import mg.dot.feufaro.solfa.Transpose
|
|||
import mg.dot.feufaro.viewmodel.SolfaScreenModel
|
||||
import java.io.File
|
||||
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class, InternalVoyagerApi::class)
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun MainScreenWithDrawer(
|
||||
solfaScreenModel: SolfaScreenModel,
|
||||
sharedScreenModel: SharedScreenModel,
|
||||
qrCodeResult: String,
|
||||
onScannerButtonClick: () -> Unit,
|
||||
solfaScrollState: ScrollState,
|
||||
content: @Composable (PaddingValues) -> Unit,
|
||||
) {
|
||||
|
|
@ -201,22 +199,6 @@ fun MainScreenWithDrawer(
|
|||
val density = LocalDensity.current
|
||||
var keyboardHeightDp by remember { mutableStateOf(0.dp) }
|
||||
|
||||
BackHandler(enabled = isSearchActive) {
|
||||
sharedScreenModel.showSearchMenu(false)
|
||||
}
|
||||
BackHandler(enabled = showMidiCtrl) {
|
||||
sharedScreenModel.setMidiCtrl(false)
|
||||
}
|
||||
BackHandler(enabled = isQrVisible) {
|
||||
sharedScreenModel.toggleQRCodeVisibility()
|
||||
}
|
||||
BackHandler(enabled = (!showMidiCtrl && isExpanded)) {
|
||||
sharedScreenModel.setExpandedFAB(!isExpanded)
|
||||
}
|
||||
BackHandler(enabled = drawerState.isOpen) {
|
||||
scope.launch { drawerState.close() }
|
||||
}
|
||||
|
||||
ModalNavigationDrawer(drawerState = drawerState, drawerContent = {
|
||||
SimpleDrawerContent(
|
||||
items,
|
||||
|
|
@ -225,6 +207,10 @@ fun MainScreenWithDrawer(
|
|||
currentActivePath,
|
||||
drawerState,
|
||||
scope,
|
||||
onScannerButtonClick = {
|
||||
scope.launch { drawerState.close() }
|
||||
onScannerButtonClick()
|
||||
},
|
||||
onSongSelected = { newSong ->
|
||||
sharedScreenModel.loadNewSong("$midiFile")
|
||||
},
|
||||
|
|
@ -468,8 +454,7 @@ fun MainScreenWithDrawer(
|
|||
}
|
||||
}
|
||||
}, actions = {
|
||||
val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState()
|
||||
var tempInterval by remember(fileContent, appliedInterval) { mutableStateOf(appliedInterval) }
|
||||
var tempInterval by remember(fileContent) { mutableStateOf(0) }
|
||||
var isEyeVisible by remember { mutableStateOf(false) }
|
||||
val isMinor = songKey.endsWith("m", ignoreCase = true)
|
||||
val cleanSongKey = if (isMinor) songKey.dropLast(1) else songKey
|
||||
|
|
@ -477,9 +462,10 @@ fun MainScreenWithDrawer(
|
|||
val songKeyIndex = keysOrder.indexOf(cleanSongKey).takeIf { it != -1 } ?: 0
|
||||
val rawKeyIndex = (songKeyIndex + tempInterval) % 12
|
||||
val tempUiKey = keysOrder[if (rawKeyIndex < 0) rawKeyIndex + 12 else rawKeyIndex]
|
||||
val appliedInterval by sharedScreenModel.transpositionInterval.collectAsState()
|
||||
val isPendingChange = tempInterval != appliedInterval
|
||||
val isCurrentlyTransposed = appliedInterval != 0
|
||||
val formattedKey = if (isMinor) "${tempUiKey}m" else tempUiKey
|
||||
|
||||
Box(
|
||||
modifier = Modifier.padding(end = 16.dp),
|
||||
contentAlignment = Alignment.TopCenter
|
||||
|
|
@ -489,11 +475,11 @@ fun MainScreenWithDrawer(
|
|||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Text(
|
||||
text = formattedKey,
|
||||
text = if(isMinor) "${tempUiKey}m" else tempUiKey,
|
||||
style = MaterialTheme.typography.displaySmall,
|
||||
fontWeight = FontWeight.Black,
|
||||
textAlign = TextAlign.Center,
|
||||
color = if (isCurrentlyTransposed || isPendingChange) MaterialTheme.colorScheme.tertiary else Color.White,
|
||||
color = if (isCurrentlyTransposed && !isPendingChange) Color(0xFFFFD700) else Color.White,
|
||||
modifier = Modifier
|
||||
.clickable(
|
||||
interactionSource = sharedInteractionSource,
|
||||
|
|
@ -507,10 +493,7 @@ fun MainScreenWithDrawer(
|
|||
|
||||
DropdownMenu(
|
||||
expanded = isEyeVisible,
|
||||
onDismissRequest = {
|
||||
tempInterval = appliedInterval
|
||||
isEyeVisible = false
|
||||
},
|
||||
onDismissRequest = { isEyeVisible = false },
|
||||
containerColor = Color(0xFF2C3135).copy(alpha = 0.75f),
|
||||
shape = RoundedCornerShape(16.dp),
|
||||
modifier = Modifier.padding(12.dp)
|
||||
|
|
@ -520,8 +503,6 @@ fun MainScreenWithDrawer(
|
|||
verticalArrangement = Arrangement.spacedBy(8.dp)
|
||||
) {
|
||||
/* < = > */
|
||||
val isOriginalKeyC = cleanSongKey.equals("C", ignoreCase = true)
|
||||
val isTransposedToC = tempUiKey.equals("C", ignoreCase = true) && !isOriginalKeyC
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
||||
|
|
@ -554,11 +535,11 @@ fun MainScreenWithDrawer(
|
|||
}
|
||||
|
||||
val centralIcon =
|
||||
if (isPendingChange && !isTransposedToC) Icons.Filled.Check else Icons.Filled.SwapHoriz
|
||||
if (isPendingChange) Icons.Filled.Check else Icons.Filled.SwapHoriz
|
||||
val centralTint =
|
||||
if (isPendingChange) MaterialTheme.colorScheme.tertiary else Color.White
|
||||
val tooltipText =
|
||||
if (isPendingChange) "Écoutez en $tempUiKey" else if (isCurrentlyTransposed) "Revenir en $songKey" else ""
|
||||
if (isPendingChange) "Transposer en $tempUiKey" else if (isCurrentlyTransposed) "Revenir en $songKey" else "Transposer"
|
||||
|
||||
TooltipBox(
|
||||
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
|
||||
|
|
@ -573,18 +554,13 @@ fun MainScreenWithDrawer(
|
|||
IconButton(
|
||||
modifier = Modifier.size(36.dp),
|
||||
onClick = {
|
||||
if (isPendingChange) {
|
||||
sharedScreenModel.setTranspositionInterval(tempInterval)
|
||||
sharedScreenModel.stopMidi()
|
||||
sharedScreenModel.seekTo(0f)
|
||||
solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value)
|
||||
} else if (isCurrentlyTransposed) {
|
||||
if (!isPendingChange && isCurrentlyTransposed) {
|
||||
tempInterval = 0
|
||||
sharedScreenModel.setTranspositionInterval(0)
|
||||
sharedScreenModel.stopMidi()
|
||||
sharedScreenModel.seekTo(0f)
|
||||
solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value)
|
||||
} else {
|
||||
sharedScreenModel.setTranspositionInterval(tempInterval)
|
||||
}
|
||||
solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value)
|
||||
isEyeVisible = false
|
||||
}
|
||||
) {
|
||||
|
|
@ -623,35 +599,22 @@ fun MainScreenWithDrawer(
|
|||
|
||||
val cIndex = keysOrder.indexOf("C")
|
||||
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(
|
||||
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
|
||||
tooltip = {
|
||||
PlainTooltip(
|
||||
containerColor = Color.DarkGray,
|
||||
contentColor = Color.White
|
||||
) { Text(text = tooltipTextC, fontSize = 12.sp) }
|
||||
) { Text(text = "Transposer en Do (C)", fontSize = 12.sp) }
|
||||
},
|
||||
state = rememberTooltipState()
|
||||
) {
|
||||
OutlinedButton(
|
||||
onClick = {
|
||||
if (isTransposedToC) {
|
||||
tempInterval = 0
|
||||
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)
|
||||
}
|
||||
tempInterval = intervalToC
|
||||
sharedScreenModel.setTranspositionInterval(intervalToC)
|
||||
solfaScreenModel.loadFromFile(sharedScreenModel.activeFilePath.value)
|
||||
isEyeVisible = false
|
||||
},
|
||||
modifier = Modifier.fillMaxWidth().height(36.dp),
|
||||
|
|
@ -665,7 +628,7 @@ fun MainScreenWithDrawer(
|
|||
)
|
||||
) {
|
||||
Text(
|
||||
text = buttonText,
|
||||
text = "Transposer en C",
|
||||
fontSize = 12.sp,
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
|
|
@ -822,10 +785,9 @@ fun MainScreenWithDrawer(
|
|||
)
|
||||
|
||||
if (!savedPath.isNullOrEmpty()) {
|
||||
val transpositionInterval = sharedScreenModel.transpositionInterval.value
|
||||
val bpm = sharedScreenModel.getBpmFlow().value ?: 120f
|
||||
|
||||
solfaScreenModel.generateMidiFile(bpm, savedPath, transpositionInterval)
|
||||
solfaScreenModel.generateMidiFile(bpm, savedPath)
|
||||
println("Fichier MIDI enregistré avec succès sous : $savedPath")
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
|
|
@ -1162,24 +1124,6 @@ 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
|
||||
private fun MyFAB(
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ fun SimpleDrawerContent(
|
|||
activePath: String = Solfa.currentFile,
|
||||
drawerState: DrawerState,
|
||||
scope: CoroutineScope,
|
||||
onScannerButtonClick: () -> Unit,
|
||||
onSongSelected: (String) -> Unit,
|
||||
onSettingsCheck: () -> Unit,
|
||||
onAboutCheck: () -> Unit,
|
||||
|
|
@ -194,7 +195,7 @@ fun SimpleDrawerContent(
|
|||
|
||||
stickyHeader {
|
||||
DrawerHeaderSticky(
|
||||
title = "Fichiers locaux",
|
||||
title = "Personnel",
|
||||
icon = Icons.Default.LibraryMusic,
|
||||
isExpanded = externalExpanded,
|
||||
onToggle = { externalExpanded = !externalExpanded },
|
||||
|
|
|
|||
|
|
@ -290,11 +290,6 @@ class SharedScreenModel(private val fileRepository: FileRepository) : ScreenMode
|
|||
transpositionInterval.value = interval
|
||||
}
|
||||
|
||||
val transpToCInt = MutableStateFlow(0)
|
||||
fun setTranspToC(count: Int) {
|
||||
transpToCInt.value = count
|
||||
}
|
||||
|
||||
private val _synchronizedSYllables = MutableStateFlow<List<String>>(emptyList())
|
||||
val synchronizedSyllables: StateFlow<List<String>> = _synchronizedSYllables.asStateFlow()
|
||||
|
||||
|
|
@ -733,7 +728,6 @@ class SharedScreenModel(private val fileRepository: FileRepository) : ScreenMode
|
|||
_sourceModeState.value = false
|
||||
_harmonyView.value = false
|
||||
setTranspositionInterval(0)
|
||||
setTranspToC(0)
|
||||
setSilentDurBefr(0)
|
||||
_midiMarkersList.value = emptyList()
|
||||
_tuoTimestamps.value = emptyList()
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class SolfaScreenModel(
|
|||
solfa.createNewSolfa(metadata)
|
||||
}
|
||||
}
|
||||
fun generateMidiFile(bpm: Float, path: String, transpI: Int) {
|
||||
solfa.generateMidiFile(bpm, path, transpI)
|
||||
fun generateMidiFile(bpm: Float, path: String) {
|
||||
solfa.generateMidiFile(bpm, path)
|
||||
}
|
||||
}
|
||||
|
|
@ -405,7 +405,7 @@ actual class FMediaPlayer actual constructor(
|
|||
}
|
||||
// Farany
|
||||
finReg.containsMatchIn(mTrim) -> {
|
||||
val hasDcOrDsAfter = metadataList.any { m ->
|
||||
val hasDcAfter = metadataList.any { m ->
|
||||
val after = (m.gridIndex ?: 0) > currentIndex
|
||||
|
||||
println(
|
||||
|
|
@ -413,15 +413,14 @@ actual class FMediaPlayer actual constructor(
|
|||
)
|
||||
|
||||
val hasMarker = m.marker.any { mk ->
|
||||
dcRegex.containsMatchIn(mk) || dsRegex.containsMatchIn(mk)
|
||||
dcRegex.matches(mk.trim())
|
||||
}
|
||||
|
||||
println("after=$after, hasMarker=$hasMarker, result=${after && hasMarker}")
|
||||
|
||||
after && hasMarker
|
||||
}
|
||||
|
||||
if (hasDcOrDsAfter) {
|
||||
if (hasDcAfter) {
|
||||
navigationSteps.add(
|
||||
NavigationStep(
|
||||
marker = marker,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue