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

sound engine is no longer a singleton

Browse Source
This commit is contained in:
minjaesong
2024-01-16 02:50:47 +09:00
parent 350e205028
commit 755ced9ea4
30 changed files with 275 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/net/torvald/terrarum/audio/TerrarumAudioMixerTrack.kt
View File

@@ -1,11 +1,9 @@
package net.torvald.terrarum.audio
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.audio.Sound
import com.badlogic.gdx.backends.lwjgl3.audio.OpenALLwjgl3Audio
import com.badlogic.gdx.utils.Disposable
import com.badlogic.gdx.utils.Queue
import net.torvald.reflection.forceInvoke
import net.torvald.terrarum.App
import net.torvald.terrarum.audio.dsp.NullFilter
import net.torvald.terrarum.audio.dsp.TerrarumAudioFilter
@@ -35,7 +33,6 @@ class TerrarumAudioMixerTrack(
const val SAMPLING_RATE = 48000
const val SAMPLING_RATEF = 48000f
const val SAMPLING_RATED = 48000.0
val AUDIO_BUFFER_SIZE = App.getConfigInt("audio_buffer_size") // n ms -> 384 * n
}
val hash = getHashStr()
@@ -168,7 +165,7 @@ class TerrarumAudioMixerTrack(
// 1st ring of the hell: the THREADING HELL //
internal var processor = MixerTrackProcessor(AUDIO_BUFFER_SIZE, SAMPLING_RATE, this)
internal var processor = MixerTrackProcessor(App.audioBufferSize, SAMPLING_RATE, this)
/*private val processorThread = Thread(processor).also { // uncomment to multithread
it.priority = MAX_PRIORITY // higher = more predictable; audio delay is very noticeable so it gets high priority
it.start()
@@ -178,8 +175,8 @@ class TerrarumAudioMixerTrack(
private lateinit var queueDispatcherThread: Thread
init {
pcmQueue.addLast(listOf(FloatArray(AUDIO_BUFFER_SIZE), FloatArray(AUDIO_BUFFER_SIZE)))
pcmQueue.addLast(listOf(FloatArray(AUDIO_BUFFER_SIZE), FloatArray(AUDIO_BUFFER_SIZE)))
pcmQueue.addLast(listOf(FloatArray(App.audioBufferSize), FloatArray(App.audioBufferSize)))
pcmQueue.addLast(listOf(FloatArray(App.audioBufferSize), FloatArray(App.audioBufferSize)))
/*if (isMaster) { // uncomment to multithread
queueDispatcher = FeedSamplesToAdev(BUFFER_SIZE, SAMPLING_RATE, this)
@@ -190,6 +187,16 @@ class TerrarumAudioMixerTrack(
}*/
}
fun updateBufferSizeChange() {
// printdbg(this, "new buffer size: $App.audioMixerBufferSize")
pcmQueue.clear()
pcmQueue.addLast(listOf(FloatArray(App.audioBufferSize), FloatArray(App.audioBufferSize)))
pcmQueue.addLast(listOf(FloatArray(App.audioBufferSize), FloatArray(App.audioBufferSize)))
processor.reset(App.audioBufferSize)
filters.forEach { it.reset() }
}
override fun hashCode() = hashCode0
}