changing audio output causes new audio worklet even when signal remai…

…ns the same
dktr0 · Nov 27, 2024 · 56805dd · 56805dd
1 parent 44116fb
commit 56805dd
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 123 deletions.
diff --git a/punctual.js b/punctual.js
diff --git a/src/AudioWorklet.purs b/src/AudioWorklet.purs
@@ -14,10 +14,12 @@ import Signal (Signal)
 import WebAudio (WebAudioContext,WebAudioNode)
 import W
 import AudioPanning (aout)
+import Output (Output,audioOutputChannels,audioOutputOffset)
 
 type AudioWorklet = {
   name :: String,
   signal :: Signal,
+  output :: Output,
   code :: String,
   audioWorklet' :: AudioWorklet'
   }
@@ -27,11 +29,13 @@ type AudioWorklet' = {
   audioWorkletNode :: Nullable WebAudioNode
   }
 
-runWorklet :: WebAudioContext -> Nullable WebAudioNode -> WebAudioNode -> String -> Signal -> Int -> Int -> Number -> Number -> Effect AudioWorklet
-runWorklet ctx ain aout name signal nOutputChnls channelOffset fInStart fInDur = do
+runWorklet :: WebAudioContext -> Nullable WebAudioNode -> WebAudioNode -> String -> Signal -> Int -> Output -> Number -> Number -> Effect AudioWorklet
+runWorklet ctx ain aout name signal maxChnls output fInStart fInDur = do
+  let nOutputChnls = audioOutputChannels maxChnls output 
+  let channelOffset = audioOutputOffset output
   let code = generateWorkletCode signal nOutputChnls channelOffset name fInStart fInDur
   audioWorklet' <- _runWorklet ctx ain aout name code (nOutputChnls+channelOffset)
-  pure { name, signal, code, audioWorklet' }
+  pure { name, signal, output, code, audioWorklet' }
 
 foreign import _runWorklet :: WebAudioContext -> Nullable WebAudioNode -> WebAudioNode -> String -> String -> Int -> Effect AudioWorklet'
 

diff --git a/src/AudioZone.purs b/src/AudioZone.purs
@@ -1,6 +1,6 @@
 module AudioZone where 
 
-import Prelude (Unit,map,bind,pure,($),discard,otherwise,(+),(<$>),(<>),show,(==),unit,max,(>=),(-),(<<<),(/),(>>>))
+import Prelude (Unit,map,bind,pure,($),discard,otherwise,(+),(<$>),(<>),show,(==),unit,max,(>=),(-),(<<<),(/),(>>>),(&&))
 import Data.Maybe (Maybe(..))
 import Data.List (List(..),zipWith,length,catMaybes)
 import Effect (Effect)
@@ -20,7 +20,7 @@ import SharedResources (SharedResources, activateAudioInput, getOutputChannelCou
 import Program (Program)
 import AudioWorklet (AudioWorklet,runWorklet,stopWorklet)
 import Action (Action,actionTimesAsAudioTime,actionHasAudioInput)
-import Output (isAudioOutput,audioOutputChannels,audioOutputOffset)
+import Output (isAudioOutput)
 import WebAudio (resumeWebAudioContext,currentTime)
 
 type AudioZone = {
@@ -56,8 +56,8 @@ addOrRemoveWorklet sharedResources _ _ (Just prevWorklet) Nothing = do
   stopWorklet prevWorklet (t+0.25) 0.1
   pure Nothing
 addOrRemoveWorklet sharedResources evalTime clockDiff (Just prevWorklet) (Just action) = do
-  case prevWorklet.signal == action.signal of
-    true -> pure (Just prevWorklet) -- no change in signal, maintain existing worklet
+  case (prevWorklet.signal == action.signal && prevWorklet.output == action.output) of
+    true -> pure (Just prevWorklet) -- no change in signal/output, maintain existing worklet
     false -> do
       tempo <- read sharedResources.tempo
       let Tuple t1 t2 = actionTimesAsAudioTime tempo evalTime clockDiff action
@@ -78,9 +78,7 @@ addWorklet sharedResources action t1 t2 = do
               log "worklet does not have audio input"
               pure null
   maxChnls <- getOutputChannelCount sharedResources
-  let nOutputChnls = audioOutputChannels maxChnls action.output
-  let channelOffset = audioOutputOffset action.output
-  runWorklet sharedResources.webAudioContext nAin sharedResources.internalAudioOutputNode ("W" <> show i) action.signal nOutputChnls channelOffset t1 (t2-t1)
+  runWorklet sharedResources.webAudioContext nAin sharedResources.internalAudioOutputNode ("W" <> show i) action.signal maxChnls action.output t1 (t2-t1)
 
 calculateAudioZoneInfo :: AudioZone -> Effect String
 calculateAudioZoneInfo z = do