curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-19 06:54:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: getFreeTrack() would return a track it just returned when the timing coincides

Browse Source
This commit is contained in:
minjaesong
2024-02-21 21:43:55 +09:00
parent 549c03c2b4
commit f7b0dfb5bb
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/torvald/terrarum/audio/AudioMixer.kt
View File

@@ -124,7 +124,7 @@ class AudioMixer : Disposable {
*/
fun getFreeTrackNoMatterWhat(): TerrarumAudioMixerTrack {
synchronized(this) {
return getFreeTrack() ?: dynamicTracks.minBy { it.playStartedTime }
return getFreeTrack() ?: dynamicTracks.minBy { it.playStartedTime }.also { it.checkedOutTime = System.nanoTime() }
}
}
@@ -134,7 +134,10 @@ class AudioMixer : Disposable {
fun getFreeTrack(): TerrarumAudioMixerTrack? {
synchronized(this) {
return dynamicTracks.filter { it.trackingTarget == null && !it.isPlaying }
.minByOrNull { it.playStartedTime }
.minByOrNull { maxOf(it.checkedOutTime, it.playStartedTime) }
.also {
it?.checkedOutTime = System.nanoTime()
}
}
}