harmonic series init properly, fixed rare null pointer exception

mktwohy · Dec 7, 2021 · f2c9502 · f2c9502
1 parent 62a5b4e
commit f2c9502
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/SignalLib/src/main/java/com/example/signallib/SignalEngine.kt b/SignalLib/src/main/java/com/example/signallib/SignalEngine.kt
@@ -80,16 +80,12 @@ class SignalEngine(
             audioTrack.play()
 
             while (runMainLoop) {
-                // poll from realtime input queues
-                if(noteQueue.isNotEmpty())
-                    currentNotes.replaceAll(noteQueue.poll()!!)
+                // poll from realtime input queues. if not null, update property
+                noteQueue.poll()?.also { currentNotes.replaceAll(it) }
 
-                if(pitchBendQueue.isNotEmpty())
-                    pitchBend = pitchBendQueue.poll()!!
-
-                if(ampQueue.isNotEmpty())
-                    amp = ampQueue.poll()!!
+                pitchBendQueue.poll()?.also { pitchBend = it }
 
+                ampQueue.poll()?.also { amp = it }
 
                 // check if audio buffer needs to be updated
                 // (ensures silent audio doesn't get rendered)
@@ -102,7 +98,9 @@ class SignalEngine(
                         amp = amp
                     )
 
-                    afterBufferWriteOneTimeListeners.forEach { it.invoke(audioBuffer) }
+                    val removedNotes = prevNotes.filter{ it !in currentNotes }
+                    signalManager.resetSignals(removedNotes.toSet())
+
                     prevNotes.replaceAll(currentNotes)
                 }
 

diff --git a/SignalLib/src/main/java/com/example/signallib/SignalManager.kt b/SignalLib/src/main/java/com/example/signallib/SignalManager.kt
@@ -24,6 +24,10 @@ class SignalManager(val signalSettings: SignalSettings) {
         }
     }
 
+    fun resetSignals(notes: Set<Note>){
+        notes.forEach{ noteToSignal[it]?.reset() }
+    }
+
     fun renderToBuffer(buffer: FloatArray, notes: Set<Note>, pitchBend: Float, amp: Float){
         // assign pitch bend to appropriate signals
         for(note in notes) {

diff --git a/app/src/main/java/com/example/synth/MainActivity.kt b/app/src/main/java/com/example/synth/MainActivity.kt
@@ -113,7 +113,6 @@ class MainActivity : ComponentActivity() {
             signalEngine.registerAfterBufferWriteCallback {
                 currentAudio = it.toList()
             }
-            signalSettings.harmonicSeries[1] = 1f
 
             signalEngine.play()
         }

diff --git a/app/src/main/java/com/example/synth/ViewModels.kt b/app/src/main/java/com/example/synth/ViewModels.kt
@@ -8,6 +8,7 @@ import com.example.signallib.Note.Companion.nextWhiteNote
 import com.example.signallib.Note.Companion.prevWhiteNote
 import java.util.*
 import kotlin.math.abs
+import kotlin.math.sign
 
 class SignalPlotViewModel(
     val signalSettings: SignalSettings,
@@ -106,15 +107,15 @@ class HarmonicSeriesViewModel(
     val harmonicSeriesUpdateQueue: Queue<Pair<Int, Float>> = LinkedList()
 
     init {
-        repeat(signalSettings.harmonicSeries.numHarmonics){
-            sliderState.add(0f)
+        with(signalSettings.harmonicSeries){
+            for (i in 1..numHarmonics){
+                sliderState.add(this[i]) }
         }
         AppModel.signalEngine.registerAfterBufferWriteCallback {
             if (harmonicSeriesUpdateQueue.isNotEmpty()){
                 val (sliderIndex, sliderValue) = harmonicSeriesUpdateQueue.poll()!!
                 signalSettings.harmonicSeries[sliderIndex+1] = volumeToAmplitude(sliderValue)
             }
-//            logd("queue size: ${harmonicSeriesUpdateQueue.size}")
         }
     }