audio analysis pathways probably all restored to the point where all …

…0.4 functionality in Estuary works the same way with 0.5

src/AudioAnalyser.purs

@@ -12,7 +12,7 @@ import WebAudio
 
 type AudioAnalyser = {
   webAudioContext :: WebAudioContext,
-  sourceNode :: WebAudioNode,
+  sourceNode :: Ref WebAudioNode,
   mAnalyserNode :: Ref (Maybe WebAudioNode),
   analyserArray :: AnalyserArray,
   lo :: Ref Number,
@@ -21,7 +21,8 @@ type AudioAnalyser = {
   }
 
 newAudioAnalyser :: WebAudioContext -> WebAudioNode -> Effect AudioAnalyser
-newAudioAnalyser webAudioContext sourceNode = do
+newAudioAnalyser webAudioContext n = do
+  sourceNode <- new n
   mAnalyserNode <- new Nothing
   analyserArray <- _analyserArray 512
   lo <- new 0.0
@@ -43,7 +44,8 @@ _disactivateAnalysis a = do
   case mAnalyserNode of
     Nothing -> pure unit  -- analysis is not currently active, so nothing more to do
     Just analyserNode -> do -- disactivate
-      disconnect a.sourceNode analyserNode
+      sourceNode <- read a.sourceNode
+      disconnect sourceNode analyserNode
       write Nothing a.mAnalyserNode
       log "punctual: disactivating an audio analyser..."
 
@@ -54,7 +56,8 @@ _activateAnalysis a = do
     Just analyserNode -> pure analyserNode -- analysis is already active, so nothing more to do
     Nothing -> do -- analysis is not active, so need to make new source and analyser nodes
       analyserNode <- _analyserNode a.webAudioContext 1024 0.5
-      connect a.sourceNode analyserNode
+      sourceNode <- read a.sourceNode
+      connect sourceNode analyserNode
       write (Just analyserNode) a.mAnalyserNode
       log "punctual: activating an audio analyser..."
       pure analyserNode
@@ -76,6 +79,17 @@ updateAnalyser a needs = do
       when (unwrap needs.hi) $ do
         x <- _getHi a.analyserArray
         write x a.hi
+
+setSourceNode :: AudioAnalyser -> WebAudioNode -> Effect Unit
+setSourceNode a newSourceNode = do
+  mAnalyserNode <- read a.mAnalyserNode
+  case mAnalyserNode of
+    Just analyserNode -> do
+      oldSourceNode <- read a.sourceNode
+      disconnect oldSourceNode analyserNode
+      connect newSourceNode analyserNode
+    Nothing -> pure unit
+  write newSourceNode a.sourceNode
 
 foreign import data AnalyserArray :: Type
 

src/SharedResources.purs

@@ -16,7 +16,7 @@ import Data.Newtype (unwrap)
 
 import WebGLCanvas (WebGLCanvas, WebGLContext, WebGLTexture)
 import WebAudio
-import AudioAnalyser (AudioAnalyser,newAudioAnalyser,updateAnalyser)
+import AudioAnalyser (AudioAnalyser,newAudioAnalyser,updateAnalyser,setSourceNode)
 import Value (LibraryCache) 
 
 type URL = String
@@ -217,12 +217,14 @@ disactivateAudioInput sr = do
       log "punctual audio input disactivated"
 
 -- called externally to use audio output other than the audio context destination
+-- note: cannot be set to destination of audio context (since that can't be a source for audio analysis)
 setAudioOutput :: SharedResources -> WebAudioNode -> Effect Unit
 setAudioOutput sr newExternalAudioOutputNode = do
   externalAudioOutputNode <- read sr.externalAudioOutputNode
   disconnect sr.internalAudioOutputNode externalAudioOutputNode
   connect sr.internalAudioOutputNode newExternalAudioOutputNode
   write newExternalAudioOutputNode sr.externalAudioOutputNode
+  setSourceNode sr.outputAnalyser newExternalAudioOutputNode
 
 
 -- Brightness