Merge branch 'main' into dev/audio_device_panel

Author: kunitoki

examples/audiograph/source/AudioGraphApp.cpp

@@ -203,8 +203,10 @@ void AudioGraphApp::audioDeviceAboutToStart (yup::AudioIODevice* device)
     nodeRegistry.setPluginScanner (scanner.get(), ctx);
 #endif
 
-    graph->prepareToPlay (static_cast<float> (device->getCurrentSampleRate()),
-                          device->getCurrentBufferSizeSamples());
+    const auto spec = yup::AudioSpec (
+        static_cast<float> (device->getCurrentSampleRate()),
+        device->getCurrentBufferSizeSamples());
+    graph->prepareToPlay (spec);
 }
 
 void AudioGraphApp::audioDeviceStopped()

examples/audiograph/source/nodes/AnalyzerNodes.h

@@ -155,7 +155,7 @@ class OscilloscopeProcessor final : public yup::AudioProcessor
         analyzerState.setOverlapFactor (0.0f);
     }
 
-    void prepareToPlay (float, int) override
+    void prepareToPlay (const yup::AudioSpec&) override
     {
         analyzerState.reset();
         peakLevel.store (0.0f, std::memory_order_relaxed);
@@ -379,7 +379,7 @@ class SpectrumAnalyzerProcessor final : public yup::AudioProcessor
         analyzerState.setOverlapFactor (0.5f);
     }
 
-    void prepareToPlay (float, int) override
+    void prepareToPlay (const yup::AudioSpec&) override
     {
         analyzerState.reset();
         peakLevel.store (0.0f, std::memory_order_relaxed);

examples/audiograph/source/nodes/DistortionNodes.h

@@ -46,17 +46,17 @@ class TanhDistortionProcessor final : public yup::AudioProcessor
         updateLatency();
     }
 
-    void prepareToPlay (float newSampleRate, int maxBlockSize) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
-        const auto sampleRate = yup::jmax (1.0f, newSampleRate);
-        const auto blockSize = yup::jmax (1, maxBlockSize);
+        const auto sampleRate = yup::jmax (1.0f, spec.sampleRate);
+        const auto blockSize = yup::jmax (1, spec.maxBlockSize);
 
         oversampler2x.prepare (sampleRate, maximumOversampledChannels, blockSize);
         oversampler4x.prepare (sampleRate, maximumOversampledChannels, blockSize);
         oversampler8x.prepare (sampleRate, maximumOversampledChannels, blockSize);
         oversamplersPrepared = true;
 
-        smoothedDrive.reset (newSampleRate, 0.02);
+        smoothedDrive.reset (sampleRate, 0.02);
         smoothedDrive.setCurrentAndTargetValue (getDrive());
 
         updateLatency();
@@ -279,14 +279,14 @@ class BlunterSoftClipperProcessor final : public yup::AudioProcessor
         addParameter (output);
     }
 
-    void prepareToPlay (float newSampleRate, int maxBlockSize) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
         for (auto& clipper : clippers)
-            clipper.prepare (newSampleRate, maxBlockSize);
+            clipper.prepare (spec.sampleRate, spec.maxBlockSize);
 
-        smoothedDrive.reset (newSampleRate, 0.02);
+        smoothedDrive.reset (spec.sampleRate, 0.02);
         smoothedDrive.setCurrentAndTargetValue (getDrive());
-        smoothedOutput.reset (newSampleRate, 0.02);
+        smoothedOutput.reset (spec.sampleRate, 0.02);
         smoothedOutput.setCurrentAndTargetValue (getOutput());
     }
 
@@ -592,14 +592,14 @@ class AaIirHardClipperProcessor final : public yup::AudioProcessor
         addParameter (output);
     }
 
-    void prepareToPlay (float newSampleRate, int maxBlockSize) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
         for (auto& clipper : clippers)
-            clipper.prepare (static_cast<double> (newSampleRate), maxBlockSize);
+            clipper.prepare (static_cast<double> (spec.sampleRate), spec.maxBlockSize);
 
-        smoothedDrive.reset (newSampleRate, 0.02);
+        smoothedDrive.reset (spec.sampleRate, 0.02);
         smoothedDrive.setCurrentAndTargetValue (getDrive());
-        smoothedOutput.reset (newSampleRate, 0.02);
+        smoothedOutput.reset (spec.sampleRate, 0.02);
         smoothedOutput.setCurrentAndTargetValue (getOutput());
     }
 

examples/audiograph/source/nodes/FractionalDelayNode.h

@@ -49,9 +49,9 @@ class FractionalDelayProcessor final : public yup::AudioProcessor
         addParameter (dryWet);
     }
 
-    void prepareToPlay (float newSampleRate, int) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
-        sampleRate.store (yup::jmax (1.0f, newSampleRate), std::memory_order_relaxed);
+        sampleRate.store (yup::jmax (1.0f, spec.sampleRate), std::memory_order_relaxed);
 
         const int maxDelaySamples = yup::roundToInt (delayMillisecondsToSamples (maximumDelayMilliseconds));
         for (auto& delayLine : delayLines)

examples/audiograph/source/nodes/GainNode.h

@@ -36,9 +36,9 @@ class GainProcessor final : public yup::AudioProcessor
         addParameter (gain);
     }
 
-    void prepareToPlay (float newSampleRate, int) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
-        smoothedGain.reset (newSampleRate, 0.02);
+        smoothedGain.reset (spec.sampleRate, 0.02);
         smoothedGain.setCurrentAndTargetValue (getGain());
     }
 

examples/audiograph/source/nodes/LatencyNode.h

@@ -41,12 +41,12 @@ class LatencyProcessor final : public yup::AudioProcessor
         reportUpdatedLatency();
     }
 
-    void prepareToPlay (float newSampleRate, int maxBlockSize) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
-        sampleRate.store (yup::jmax (1.0f, newSampleRate), std::memory_order_relaxed);
+        sampleRate.store (yup::jmax (1.0f, spec.sampleRate), std::memory_order_relaxed);
 
         const int maxDelaySamples = delayMillisecondsToSamples (maximumDelayMilliseconds);
-        history.setSize (2, maxDelaySamples + yup::jmax (1, maxBlockSize) + 1);
+        history.setSize (2, maxDelaySamples + yup::jmax (1, spec.maxBlockSize) + 1);
         history.clear();
 
         writePosition = 0;

examples/audiograph/source/nodes/NodeRegistry.h

@@ -36,6 +36,7 @@
 #include "PluginNodeView.h"
 #include "RecorderNode.h"
 #include "SamplePlayerNode.h"
+#include "SpectralPassthroughNode.h"
 #include "SubgraphNode.h"
 
 //==============================================================================
@@ -87,6 +88,9 @@ class NodeRegistry
     /** Stable factory key for the built-in recorder node. */
     static constexpr const char* recorderIdentifier = "internal.recorder";
 
+    /** Stable factory key for the built-in spectral passthrough node. */
+    static constexpr const char* spectralPassthroughIdentifier = "internal.spectralPassthrough";
+
     /** Stable factory key for the built-in recursive subgraph node. */
     static constexpr const char* subgraphIdentifier = "internal.subgraph";
 
@@ -305,6 +309,21 @@ class NodeRegistry
         }
         };
 
+        entries[spectralPassthroughIdentifier] = {
+            [] (const yup::AudioGraphNodeProperties&) -> yup::ResultValue<std::unique_ptr<yup::AudioProcessor>>
+        {
+            return yup::makeResultValueOk (std::make_unique<SpectralPassthroughProcessor>());
+        },
+            [] (yup::AudioGraphNodeID nodeID, yup::AudioProcessor* proc, yup::AudioGraphProcessor*) -> std::unique_ptr<yup::AudioGraphNodeView>
+        {
+            auto* spectral = dynamic_cast<SpectralPassthroughProcessor*> (proc);
+            if (spectral == nullptr)
+                return nullptr;
+
+            return std::make_unique<SpectralPassthroughNodeView> (nodeID, *spectral);
+        }
+        };
+
         entries[subgraphIdentifier] = {
             [this] (const yup::AudioGraphNodeProperties& props) -> yup::ResultValue<std::unique_ptr<yup::AudioProcessor>>
         {
@@ -528,6 +547,7 @@ class NodeRegistry
             oscilloscopeIdentifier,
             recorderIdentifier,
             samplePlayerIdentifier,
+            spectralPassthroughIdentifier,
             spectrumAnalyzerIdentifier,
             subgraphIdentifier,
             svfIdentifier,
@@ -581,6 +601,9 @@ class NodeRegistry
         if (id == recorderIdentifier)
             return "Recorder";
 
+        if (id == spectralPassthroughIdentifier)
+            return "Spectral Passthrough";
+
         if (id == subgraphIdentifier)
             return "Subgraph";
 

examples/audiograph/source/nodes/OscillatorNode.h

@@ -41,9 +41,9 @@ class OscillatorProcessor final : public yup::AudioProcessor
         addParameter (sweepEnabled);
     }
 
-    void prepareToPlay (float newSampleRate, int) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
-        sampleRate = newSampleRate;
+        sampleRate = spec.sampleRate;
         phase = 0.0;
         sweepPositionSeconds = 0.0;
         wasSweepActive = false;

examples/audiograph/source/nodes/RecorderNode.h

@@ -83,9 +83,9 @@ class RecorderProcessor final : public yup::AudioProcessor
         fifoBuffer.resize (fifoCapacity);
     }
 
-    void prepareToPlay (float sampleRate, int) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
-        currentSampleRate.store (sampleRate > 0.0f ? sampleRate : 44100.0f, std::memory_order_relaxed);
+        currentSampleRate.store (spec.sampleRate > 0.0f ? spec.sampleRate : 44100.0f, std::memory_order_relaxed);
     }
 
     void releaseResources() override {}

examples/audiograph/source/nodes/SamplePlayerNode.h

@@ -46,9 +46,9 @@ class SamplePlayerProcessor final : public yup::AudioProcessor
     {
     }
 
-    void prepareToPlay (float newSampleRate, int) override
+    void prepareToPlay (const yup::AudioSpec& spec) override
     {
-        playbackSampleRate.store (newSampleRate > 0.0f ? newSampleRate : 44100.0f, std::memory_order_relaxed);
+        playbackSampleRate.store (spec.sampleRate > 0.0f ? spec.sampleRate : 44100.0f, std::memory_order_relaxed);
     }
 
     void releaseResources() override {}