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

discovered another bug

Browse Source
This commit is contained in:
minjaesong
2023-12-03 00:42:10 +09:00
parent 0edd248194
commit 23261ab360
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/torvald/terrarum/audio/MixerTrackProcessor.kt
View File

@@ -3,7 +3,6 @@ package net.torvald.terrarum.audio
import com.badlogic.gdx.utils.Queue import com.badlogic.gdx.utils.Queue
import net.torvald.reflection.forceInvoke import net.torvald.reflection.forceInvoke
import net.torvald.terrarum.App import net.torvald.terrarum.App
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.audio.dsp.BinoPan import net.torvald.terrarum.audio.dsp.BinoPan
import net.torvald.terrarum.audio.dsp.NullFilter import net.torvald.terrarum.audio.dsp.NullFilter
import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameactors.ActorWithBody
@@ -94,10 +93,17 @@ class MixerTrackProcessor(val bufferSize: Int, val rate: Int, val track: Terraru
if (track.trackType != TrackType.MASTER && track.trackType != TrackType.BUS && track.streamPlaying) { if (track.trackType != TrackType.MASTER && track.trackType != TrackType.BUS && track.streamPlaying) {
streamBuf.fetchBytes { streamBuf.fetchBytes {
// FIXME THIS IS NOT THREAD SAFE: trying to play different audio too fast too much, shits happen // FIXME THIS IS NOT THREAD SAFE: trying to play different audio too fast too much, shits happen
val bytesRead = track.currentTrack?.gdxMusic?.forceInvoke<Int>("read", arrayOf(it)) // OR somehow make sfx memory-streamable
if (bytesRead == null || bytesRead <= 0) { // some class (namely Mp3) may return 0 instead of negative value try {
val bytesRead = track.currentTrack?.gdxMusic?.forceInvoke<Int>("read", arrayOf(it))
if (bytesRead == null || bytesRead <= 0) { // some class (namely Mp3) may return 0 instead of negative value
// printdbg("Finished reading audio stream") // printdbg("Finished reading audio stream")
track.stop() track.stop()
}
}
catch (e: Throwable) {
e.printStackTrace()
it.fill(0)
} }
} }