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

audiomanager: will gracefully not play if there is nothing to play

Browse Source
This commit is contained in:
minjaesong
2023-11-21 00:21:19 +09:00
parent 4b17957b65
commit 6229b0f60b
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@ object AudioMixer: Disposable {
init { init {
masterTrack.filters[0] = SoftLim masterTrack.filters[0] = SoftLim
masterTrack.filters[1] = Buffer masterTrack.filters[1] = Buffer
masterTrack.filters[2] = Scope masterTrack.filters[2] = Scope()
fadeBus.addSidechainInput(musicTrack, 1.0) fadeBus.addSidechainInput(musicTrack, 1.0)
fadeBus.addSidechainInput(ambientTrack, 1.0) fadeBus.addSidechainInput(ambientTrack, 1.0)

2
src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt
View File

@@ -38,7 +38,7 @@ object SoftLim : TerrarumAudioFilter() {
} }
} }
object Scope : TerrarumAudioFilter() { class Scope : TerrarumAudioFilter() {
val backbufL = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) } val backbufL = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) }
val backbufR = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) } val backbufR = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) }

17
src/net/torvald/terrarum/modulebasegame/TerrarumMusicGovernor.kt
View File

@@ -66,6 +66,9 @@ class TerrarumMusicGovernor : MusicGovernor() {
songs.forEach { songs.forEach {
App.disposables.add(it.gdxMusic) App.disposables.add(it.gdxMusic)
} }
ambients.forEach {
App.disposables.add(it.gdxMusic)
}
} }
@@ -113,17 +116,9 @@ class TerrarumMusicGovernor : MusicGovernor() {
override fun update(ingame: IngameInstance, delta: Float) { override fun update(ingame: IngameInstance, delta: Float) {
if (songs.isEmpty()) { // start the song queueing if there is one to play
if (!warningPrinted) { if (songs.isNotEmpty() && musicState == 0) musicState = STATE_INTERMISSION
warningPrinted = true if (ambients.isNotEmpty() && ambState == 0) ambState = STATE_INTERMISSION
printdbg(this, "Warning: songs list is empty")
}
return
}
// val ingame = ingame as TerrarumIngame
if (musicState == 0) musicState = STATE_INTERMISSION
if (ambState == 0) ambState = STATE_INTERMISSION
when (musicState) { when (musicState) {