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

fix: RAM music should loop as they should now

Browse Source
This commit is contained in:
minjaesong
2024-04-06 00:22:03 +09:00
parent 7416f15def
commit 3ef3f3f653
11 changed files with 180 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,7 +485,7 @@ class AudioMixer : Disposable {
private var ambientStopped = true
fun startMusic(song: MusicContainer) {
fun startMusic(song: AudioBank) {
if (musicTrack.isPlaying) {
requestFadeOut(musicTrack, DEFAULT_FADEOUT_LEN)
}
@@ -496,7 +496,7 @@ class AudioMixer : Disposable {
requestFadeOut(musicTrack, DEFAULT_FADEOUT_LEN)
}
fun startAmb(song: MusicContainer) {
fun startAmb(song: AudioBank) {
val ambientTrack = if (!ambientTrack1.streamPlaying.get())
ambientTrack1
else if (!ambientTrack2.streamPlaying.get())
@@ -513,7 +513,7 @@ class AudioMixer : Disposable {
// fade will be processed by the update()
}
fun startAmb1(song: MusicContainer) {
fun startAmb1(song: AudioBank) {
if (ambientTrack1.isPlaying == true) {
requestFadeOut(musicTrack, DEFAULT_FADEOUT_LEN)
}
@@ -521,7 +521,7 @@ class AudioMixer : Disposable {
// fade will be processed by the update()
}
fun startAmb2(song: MusicContainer) {
fun startAmb2(song: AudioBank) {
if (ambientTrack2.isPlaying == true) {
requestFadeOut(musicTrack, DEFAULT_FADEOUT_LEN)
}