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

Optimize DSFin condition

Browse source
This commit is contained in:
Hasinjato 2026-08-03 11:10:17 +03:00
parent 21b14b00a1
commit 9da97209c9
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -429,10 +429,12 @@ actual class FMediaPlayer actual constructor(
val nextMarker = markerList.getOrNull(i + 1) val nextMarker = markerList.getOrNull(i + 1)
val nextTrim = nextMarker?.trim() ?: "" val nextTrim = nextMarker?.trim() ?: ""
val isDsFin = (dsR.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim)) || val hasDs = dsR.containsMatchIn(mTrim)
(dsR.containsMatchIn(nextTrim) && finReg.containsMatchIn(mTrim)) val hasDc = dcR.containsMatchIn(mTrim)
val isDcFin = (dcR.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim)) || val hasFin = finReg.containsMatchIn(mTrim) || finReg.containsMatchIn(nextTrim)
(dcR.containsMatchIn(nextTrim) && finReg.containsMatchIn(mTrim))
val isDsFin = hasDs && hasFin
val isDcFin = hasDc && hasFin
when { when {
isDsFin || isDcFin -> { isDsFin || isDcFin -> {
val target = if (lastSegno > 0) lastSegno else 0 val target = if (lastSegno > 0) lastSegno else 0

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

@ -275,11 +275,9 @@ actual class FMediaPlayer actual constructor(
val hasDs = dsRegex.containsMatchIn(mTrim) val hasDs = dsRegex.containsMatchIn(mTrim)
val hasDc = dcRegex.containsMatchIn(mTrim) val hasDc = dcRegex.containsMatchIn(mTrim)
val hasFin = finReg.containsMatchIn(mTrim) val hasFin = finReg.containsMatchIn(mTrim) || finReg.containsMatchIn(nextTrim)
val isDcFin = hasDc && hasFin
val isDsFin = (dsRegex.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim)) val isDsFin = hasDs && hasFin
val isDcFin = (dcRegex.containsMatchIn(mTrim) && finReg.containsMatchIn(nextTrim))
when { when {
//DSFin //DSFin
isDsFin || isDcFin -> { isDsFin || isDcFin -> {