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

track stop condition via muting

Browse Source
This commit is contained in:
minjaesong
2024-01-21 19:40:11 +09:00
parent 6334cac3ba
commit 612f4b830f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,16 +363,16 @@ class AudioMixer(val bufferSize: Int): Disposable {
req.fadeoutFired = false req.fadeoutFired = false
track.volume = req.fadeTarget track.volume = req.fadeTarget
// stop streaming if fadeBus is muted // stop streaming if the track or the fader track is muted
if (req.fadeTarget == 0.0 && (track == musicTrack || track == fadeBus)) { if (req.fadeTarget == 0.0 && (track == musicTrack || track == fadeBus)) {
musicTrack.stop() musicTrack.stop()
musicTrack.currentTrack = null musicTrack.currentTrack = null
} }
if (req.fadeTarget == 0.0 && track == ambientTrack1) { if (req.fadeTarget == 0.0 && (track == ambientTrack1 || track == fadeBus)) {
ambientTrack1.stop() ambientTrack1.stop()
ambientTrack1.currentTrack = null ambientTrack1.currentTrack = null
} }
if (req.fadeTarget == 0.0 && track == ambientTrack2) { if (req.fadeTarget == 0.0 && (track == ambientTrack2 || track == fadeBus)) {
ambientTrack2.stop() ambientTrack2.stop()
ambientTrack2.currentTrack = null ambientTrack2.currentTrack = null
} }