Added lock for lazy evaluators.

KristofferStrube · Jun 5, 2024 · 4accf2d · 4accf2d
1 parent d48bec3
commit 4accf2d
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 2 deletions.
diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Analyser.cs b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Analyser.cs
@@ -9,12 +9,14 @@ public class Analyser : Node
     private AudioNode? audioNode;
     public override Func<AudioContext, Task<AudioNode>> AudioNode => async (context) =>
     {
+        _ = await audioNodeSlim.WaitAsync(200);
         if (audioNode is null)
         {
             AnalyserNode analyser = await AnalyserNode.CreateAsync(context.JSRuntime, context);
 
             audioNode = analyser;
         }
+        _ = audioNodeSlim.Release();
         return audioNode;
     };
 

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/AudioDestination.cs b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/AudioDestination.cs
@@ -9,7 +9,9 @@ public class AudioDestination : Node
     private AudioNode? audioNode;
     public override Func<AudioContext, Task<AudioNode>> AudioNode => async (context) =>
     {
+        _ = await audioNodeSlim.WaitAsync(200);
         audioNode ??= await context.GetDestinationAsync();
+        _ = audioNodeSlim.Release();
         return audioNode;
     };
 

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/BiquadFilter.cs b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/BiquadFilter.cs
@@ -12,6 +12,7 @@ public class BiquadFilter : Node
     private AudioNode? audioNode;
     public override Func<AudioContext, Task<AudioNode>> AudioNode => async (context) =>
     {
+        _ = await audioNodeSlim.WaitAsync(200);
         if (audioNode is null)
         {
             BiquadFilterOptions options = new();
@@ -24,6 +25,7 @@ public class BiquadFilter : Node
             BiquadFilterNode oscillator = await BiquadFilterNode.CreateAsync(context.JSRuntime, context, options);
             audioNode = oscillator;
         }
+        _ = audioNodeSlim.Release();
         return audioNode;
     };
 

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Gain.cs b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Gain.cs
@@ -21,6 +21,7 @@ public class Gain : Node
     private AudioNode? audioNode;
     public override Func<AudioContext, Task<AudioNode>> AudioNode => async (context) =>
     {
+        _ = await audioNodeSlim.WaitAsync(200);
         if (audioNode is null)
         {
             GainOptions options = new();
@@ -31,6 +32,7 @@ public class Gain : Node
             GainNode oscillator = await GainNode.CreateAsync(context.JSRuntime, context, options);
             audioNode = oscillator;
         }
+        _ = audioNodeSlim.Release();
         return audioNode;
     };
 

diff --git a/.../KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/MediaStreamAudioSource.cs b/.../KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/MediaStreamAudioSource.cs
@@ -11,11 +11,13 @@ public class MediaStreamAudioSource : Node
     private AudioNode? audioNode;
     public override Func<AudioContext, Task<AudioNode>> AudioNode => async (context) =>
     {
+        _ = await audioNodeSlim.WaitAsync(200);
         if (audioNode is null)
         {
             await SetMediaStreamAudioSourceNode(context);
         }
         return audioNode!;
+        _ = audioNodeSlim.Release();
     };
 
     public async Task SetMediaStreamAudioSourceNode(AudioContext context)

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Node.cs b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Node.cs
@@ -6,6 +6,8 @@ namespace KristofferStrube.Blazor.WebAudio.WasmExample.AudioEditor;
 
 public abstract class Node : Rect, ITaskQueueable
 {
+    protected readonly SemaphoreSlim audioNodeSlim = new(1, 1);
+
     public Dictionary<string, Func<AudioContext, Task<AudioParam>>> AudioParams { get; set; } = new();
     public virtual Dictionary<string, int> AudioParamPositions { get; set; } = new();
 

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Oscillator.cs b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/AudioEditor/Nodes/Oscillator.cs
@@ -21,10 +21,13 @@ public Oscillator(IElement element, SVGEditor.SVGEditor svg) : base(element, svg
     };
 
     private AudioNode? audioNode;
+
     public override Func<AudioContext, Task<AudioNode>> AudioNode => async (context) =>
     {
+        _ = await audioNodeSlim.WaitAsync(200);
         if (audioNode is null)
         {
+            Console.WriteLine("NEW Oscillator!: " + Id);
             OscillatorOptions options = new();
             if (Frequency is { } f)
             {
@@ -38,6 +41,7 @@ public Oscillator(IElement element, SVGEditor.SVGEditor svg) : base(element, svg
             await oscillator.StartAsync();
             audioNode = oscillator;
         }
+        _ = audioNodeSlim.Release();
         return audioNode;
     };
 

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/Pages/Playground.razor b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/Pages/Playground.razor
@@ -74,7 +74,10 @@ else
 
     public async ValueTask DisposeAsync()
     {
-        await AudioEditor.StopAsync();
+        if (AudioEditor is not null)
+        {
+            await AudioEditor.StopAsync();
+        }
     }
 
     private static string ToGzip(string value)

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/Shared/AudioParamSlider.razor b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/Shared/AudioParamSlider.razor
@@ -49,6 +49,7 @@
     public async Task AudioParamUpdatedAsync()
     {
         if (AudioParam is null) return;
+        Console.WriteLine("SET: " + value);
         await AudioParam.SetValueAsync(value);
         UpdateCallback?.Invoke(value);
     }

diff --git a/samples/KristofferStrube.Blazor.WebAudio.WasmExample/Shared/MainLayout.razor b/samples/KristofferStrube.Blazor.WebAudio.WasmExample/Shared/MainLayout.razor
@@ -22,7 +22,7 @@
 
 
 @code {
-    private string relativeUri => NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
+    private string relativeUri => NavigationManager.ToBaseRelativePath(NavigationManager.Uri.Split("?")[0]);
 
     protected string page => (string.IsNullOrEmpty(relativeUri) ? "Index" : relativeUri) + ".razor";
 }