Fix hosting vst and clap on mac

Author: kunitoki

cmake/yup_dependencies.cmake

@@ -128,14 +128,19 @@ function (_yup_fetch_vst3sdk)
             get_target_property (vst3sdk_source_dir sdk SOURCE_DIR)
         endif()
 
-        if (vst3sdk_source_dir AND EXISTS "${vst3sdk_source_dir}/public.sdk/source/common/memorystream.cpp")
-            target_sources (yup_audio_plugin_host_vst3sdk INTERFACE
-                "${vst3sdk_source_dir}/public.sdk/source/common/memorystream.cpp")
+        set (vst3sdk_memorystream_source "${vst3sdk_source_dir}/public.sdk/source/common/memorystream.cpp")
+        if (vst3sdk_source_dir AND EXISTS "${vst3sdk_memorystream_source}")
+            target_sources (yup_audio_plugin_host_vst3sdk INTERFACE "${vst3sdk_memorystream_source}")
         endif()
 
-        if (vst3sdk_source_dir AND EXISTS "${vst3sdk_source_dir}/public.sdk/source/vst/hosting/parameterchanges.cpp")
-            target_sources (yup_audio_plugin_host_vst3sdk INTERFACE
-                "${vst3sdk_source_dir}/public.sdk/source/vst/hosting/parameterchanges.cpp")
+        set (vst3sdk_parameterchanges_source "${vst3sdk_source_dir}/public.sdk/source/vst/hosting/parameterchanges.cpp")
+        if (vst3sdk_source_dir AND EXISTS "${vst3sdk_parameterchanges_source}")
+            target_sources (yup_audio_plugin_host_vst3sdk INTERFACE "${vst3sdk_parameterchanges_source}")
+        endif()
+
+        set (vst3sdk_eventlist_source "${vst3sdk_source_dir}/public.sdk/source/vst/hosting/eventlist.cpp")
+        if (vst3sdk_source_dir AND EXISTS "${vst3sdk_eventlist_source}")
+            target_sources (yup_audio_plugin_host_vst3sdk INTERFACE "${vst3sdk_eventlist_source}")
         endif()
     endif()
 endfunction()

modules/yup_audio_plugin_client/clap/yup_audio_plugin_client_CLAP.cpp

@@ -603,9 +603,16 @@ bool AudioPluginProcessorCLAP::initialise()
         auto wrapper = getWrapper (plugin);
         auto* audioProcessor = wrapper->audioProcessor.get();
 
-        return static_cast<uint32_t> (isInput
-                                          ? audioProcessor->getBusLayout().getInputBuses().size()
-                                          : audioProcessor->getBusLayout().getOutputBuses().size());
+        Span<const AudioBus> busses = isInput
+                                        ? audioProcessor->getBusLayout().getInputBuses()
+                                        : audioProcessor->getBusLayout().getOutputBuses();
+
+        uint32_t count = 0;
+        for (const auto& bus : busses)
+            if (bus.getType() == AudioBus::Type::Audio)
+                ++count;
+
+        return count;
     };
 
     extensionAudioPorts.get = [] (const clap_plugin_t* plugin, uint32_t index, bool isInput, clap_audio_port_info_t* info) -> bool
@@ -617,17 +624,32 @@ bool AudioPluginProcessorCLAP::initialise()
                                         ? audioProcessor->getBusLayout().getInputBuses()
                                         : audioProcessor->getBusLayout().getOutputBuses();
 
-        if (index >= static_cast<uint32_t> (busses.size()))
-            return false;
+        const AudioBus* audioBus = nullptr;
+        uint32_t audioBusIndex = 0;
 
-        const AudioBus& bus = busses[index];
+        for (const auto& bus : busses)
+        {
+            if (bus.getType() != AudioBus::Type::Audio)
+                continue;
+
+            if (audioBusIndex == index)
+            {
+                audioBus = &bus;
+                break;
+            }
+
+            ++audioBusIndex;
+        }
+
+        if (audioBus == nullptr)
+            return false;
 
         info->id = index;
-        info->channel_count = bus.getNumChannels();
+        info->channel_count = audioBus->getNumChannels();
         info->flags = (index == 0) ? CLAP_AUDIO_PORT_IS_MAIN : 0;
-        info->port_type = bus.isStereo() ? CLAP_PORT_STEREO : CLAP_PORT_MONO;
+        info->port_type = audioBus->isStereo() ? CLAP_PORT_STEREO : CLAP_PORT_MONO;
         info->in_place_pair = CLAP_INVALID_ID;
-        bus.getName().copyToUTF8 (info->name, sizeof (info->name));
+        audioBus->getName().copyToUTF8 (info->name, sizeof (info->name));
 
         return true;
     };

modules/yup_audio_plugin_host/host/yup_AudioPluginDescription.h

@@ -68,6 +68,12 @@ struct AudioPluginDescription
     /** Reported output channel count (sum across main audio output buses). */
     int numOutputChannels = 0;
 
+    /** Reported MIDI input port count. */
+    int numMidiInputPorts = 0;
+
+    /** Reported MIDI output port count. */
+    int numMidiOutputPorts = 0;
+
     bool operator== (const AudioPluginDescription& other) const noexcept
     {
         return formatType == other.formatType
@@ -80,7 +86,9 @@ struct AudioPluginDescription
             && isInstrument == other.isInstrument
             && isEffect == other.isEffect
             && numInputChannels == other.numInputChannels
-            && numOutputChannels == other.numOutputChannels;
+            && numOutputChannels == other.numOutputChannels
+            && numMidiInputPorts == other.numMidiInputPorts
+            && numMidiOutputPorts == other.numMidiOutputPorts;
     }
 
     bool operator!= (const AudioPluginDescription& other) const noexcept

modules/yup_audio_plugin_host/host/yup_AudioPluginFormat.h

@@ -46,6 +46,21 @@ class AudioPluginFormat
     /** Returns a human-readable name for the format (e.g. "VST3"). */
     virtual String getFormatName() const = 0;
 
+    /**
+        Returns the file extensions this format recognises, including the leading dot
+        (e.g. { ".vst3" } or { ".clap" }).
+
+        The scanner uses these extensions to filter filesystem entries before calling
+        scanFile(). Return an empty array for registry-based formats (e.g. AUv2) that
+        do not perform file-system scanning — the scanner will call scanFile() with an
+        invalid File instead.
+
+        Platform-specific extensions (e.g. ".dll" on Windows, ".so" on Linux) should
+        be returned conditionally so only the relevant extensions are active on each
+        platform.
+    */
+    virtual StringArray getFileExtensions() const = 0;
+
     //==============================================================================
 
     /**

modules/yup_audio_plugin_host/host/yup_AudioPluginHostContext.h

@@ -40,6 +40,9 @@ struct AudioPluginHostContext
     /** True to prefer double-precision processing where the plugin supports it. */
     bool preferDoublePrecision = false;
 
+    /** True when the host is preparing the plugin for offline/non-realtime rendering. */
+    bool isNonRealtime = false;
+
     /** Optional playhead — the host sets this before processing. */
     AudioPlayHead* playHead = nullptr;
 

modules/yup_audio_plugin_host/host/yup_AudioPluginInstance.cpp

@@ -22,6 +22,34 @@
 namespace yup
 {
 
+namespace
+{
+
+template <typename FloatType>
+void processPluginBypassedBlock (const AudioPluginDescription& description,
+                                 AudioBuffer<FloatType>& audioBuffer) noexcept
+{
+    const int numSamples = audioBuffer.getNumSamples();
+    const int numBufferChannels = audioBuffer.getNumChannels();
+    const int numInputs = jmin (description.numInputChannels, numBufferChannels);
+    const int numOutputs = jmin (description.numOutputChannels, numBufferChannels);
+    const int numChannelsToCopy = jmin (numInputs, numOutputs);
+
+    for (int channel = 0; channel < numChannelsToCopy; ++channel)
+    {
+        const auto* source = audioBuffer.getReadPointer (channel);
+        auto* destination = audioBuffer.getWritePointer (channel);
+
+        if (source != destination)
+            FloatVectorOperations::copy (destination, source, numSamples);
+    }
+
+    for (int channel = numChannelsToCopy; channel < numOutputs; ++channel)
+        audioBuffer.clear (channel, 0, numSamples);
+}
+
+} // namespace
+
 AudioPluginInstance::AudioPluginInstance (const AudioPluginDescription& description,
                                           AudioBusLayout busLayout)
     : AudioProcessor (description.name, std::move (busLayout))
@@ -41,4 +69,44 @@ AudioPluginFormatType AudioPluginInstance::getFormatType() const noexcept
     return pluginDescription.formatType;
 }
 
+void AudioPluginInstance::setNonRealtime (bool shouldBeNonRealtime) noexcept
+{
+    if (nonRealtime == shouldBeNonRealtime)
+        return;
+
+    nonRealtime = shouldBeNonRealtime;
+    nonRealtimeStateChanged();
+}
+
+bool AudioPluginInstance::isNonRealtime() const noexcept
+{
+    return nonRealtime;
+}
+
+void AudioPluginInstance::setBypassed (bool shouldBeBypassed) noexcept
+{
+    if (bypassed == shouldBeBypassed)
+        return;
+
+    bypassed = shouldBeBypassed;
+    bypassStateChanged();
+}
+
+bool AudioPluginInstance::isBypassed() const noexcept
+{
+    return bypassed;
+}
+
+void AudioPluginInstance::processBlockBypassed (AudioBuffer<float>& audioBuffer, MidiBuffer& midiBuffer)
+{
+    ignoreUnused (midiBuffer);
+    processPluginBypassedBlock (pluginDescription, audioBuffer);
+}
+
+void AudioPluginInstance::processBlockBypassed (AudioBuffer<double>& audioBuffer, MidiBuffer& midiBuffer)
+{
+    ignoreUnused (midiBuffer);
+    processPluginBypassedBlock (pluginDescription, audioBuffer);
+}
+
 } // namespace yup

modules/yup_audio_plugin_host/host/yup_AudioPluginInstance.h

@@ -52,10 +52,43 @@ class AudioPluginInstance : public AudioProcessor
     /** Returns the format type of this instance. */
     AudioPluginFormatType getFormatType() const noexcept;
 
+    //==============================================================================
+
+    /** Sets whether this instance should render in offline/non-realtime mode. */
+    void setNonRealtime (bool shouldBeNonRealtime) noexcept;
+
+    /** Returns true when this instance is rendering in offline/non-realtime mode. */
+    bool isNonRealtime() const noexcept;
+
+    /** Sets whether processBlock() should render the hosted plugin bypassed. */
+    void setBypassed (bool shouldBeBypassed) noexcept;
+
+    /** Returns true when this instance is currently bypassed. */
+    bool isBypassed() const noexcept;
+
+    /** Processes a bypassed single-precision block by copying matching inputs to
+        outputs and clearing outputs without matching inputs.
+    */
+    void processBlockBypassed (AudioBuffer<float>& audioBuffer, MidiBuffer& midiBuffer) override;
+
+    /** Processes a bypassed double-precision block by copying matching inputs to
+        outputs and clearing outputs without matching inputs.
+    */
+    void processBlockBypassed (AudioBuffer<double>& audioBuffer, MidiBuffer& midiBuffer) override;
+
 protected:
     AudioPluginDescription pluginDescription;
 
+    /** Called after setNonRealtime() changes state. */
+    virtual void nonRealtimeStateChanged() {}
+
+    /** Called after setBypassed() changes state. */
+    virtual void bypassStateChanged() {}
+
 private:
+    bool nonRealtime = false;
+    bool bypassed = false;
+
     YUP_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioPluginInstance)
 };
 

modules/yup_audio_plugin_host/host/yup_AudioPluginScanner.cpp

@@ -25,26 +25,6 @@ namespace yup
 namespace
 {
 
-bool canScanFileWithFormat (AudioPluginFormatType type, const File& file)
-{
-    switch (type)
-    {
-        case AudioPluginFormatType::vst3:
-            return file.hasFileExtension (".vst3");
-
-        case AudioPluginFormatType::clap:
-            return file.hasFileExtension (".clap");
-
-        case AudioPluginFormatType::audioUnit:
-            return false;
-
-        default:
-            break;
-    }
-
-    return false;
-}
-
 struct FileScanTask
 {
     File file;
@@ -128,35 +108,45 @@ AudioPluginScanner::ScanResult AudioPluginScanner::scan (const FileSearchPath& s
 {
     ScanResult result;
 
-    // AUv2 does not use file system scanning; delegate directly if registered.
-    if (auto* auFormat = getFormatForType (AudioPluginFormatType::audioUnit))
+    for (const auto& format : formats)
     {
-        // AUv2 scanFile() with an invalid File triggers registry enumeration
-        auto auResult = auFormat->scanFile (File {});
-        if (auResult.wasOk())
+        if (format->getFileExtensions().isEmpty())
         {
-            auto descriptions = auResult.getValue();
-            result.discovered.insert (result.discovered.end(),
-                                      descriptions.begin(),
-                                      descriptions.end());
+            auto scanResult = format->scanFile (File {});
+            if (scanResult.wasOk())
+            {
+                auto descriptions = scanResult.getValue();
+                result.discovered.insert (result.discovered.end(),
+                                          descriptions.begin(),
+                                          descriptions.end());
+            }
         }
     }
 
     std::vector<FileScanTask> tasks;
     const int numPaths = searchPath.getNumPaths();
 
-    for (int p = 0; p < numPaths; ++p)
+    for (const auto& format : formats)
     {
-        Array<File> files;
-        searchPath[p].findChildFiles (files, File::findFilesAndDirectories, true, "*", File::FollowSymlinks::noCycles);
+        String wildcardPattern;
+        for (const auto& ext : format->getFileExtensions())
+        {
+            if (wildcardPattern.isNotEmpty())
+                wildcardPattern += ";";
 
-        for (const auto& file : files)
+            wildcardPattern += "*" + ext;
+        }
+
+        if (wildcardPattern.isEmpty())
+            continue;
+
+        for (int p = 0; p < numPaths; ++p)
         {
-            for (const auto& format : formats)
-            {
-                if (! canScanFileWithFormat (format->getFormatType(), file))
-                    continue;
+            Array<File> files;
+            searchPath[p].findChildFiles (files, File::findFilesAndDirectories, true, wildcardPattern, File::FollowSymlinks::noCycles);
 
+            for (const auto& file : files)
+            {
                 FileScanTask task;
                 task.file = file;
                 task.format = format.get();

modules/yup_audio_plugin_host/host/yup_AudioPluginScanner.h

@@ -85,8 +85,8 @@ class AudioPluginScanner
         matches the format. If a format returns a success, its results are
         appended; if it fails, the path is added to ScanResult::failedPaths.
 
-        AUv2 scanning enumerates the AudioComponent registry and does not walk
-        the search path — pass an empty FileSearchPath when only AUv2 is registered.
+        Formats that return an empty array from getFileExtensions() (e.g. AUv2) use
+        registry-based discovery and are scanned independently of the search path.
     */
     ScanResult scan (const FileSearchPath& searchPath);
 

modules/yup_audio_plugin_host/native/yup_AudioPluginInstance_AUv2.h

@@ -38,6 +38,7 @@ class AUv2Format : public AudioPluginFormat
 
     AudioPluginFormatType getFormatType() const override;
     String getFormatName() const override;
+    StringArray getFileExtensions() const override;
 
     /** Returns an empty FileSearchPath — AUv2 uses AudioComponent registry. */
     FileSearchPath getDefaultSearchPaths() const override;