LV2PluginFormat: Extract headless plugin format type

modules/juce_audio_plugin_client/juce_audio_plugin_client_LV2.cpp

@@ -55,7 +55,7 @@
 #include <juce_audio_processors_headless/format_types/juce_LegacyAudioParameter.h>
 
 #include "JuceLV2Defines.h"
-#include <juce_audio_processors/format_types/juce_LV2Common.h>
+#include <juce_audio_processors_headless/format_types/juce_LV2Common.h>
 
 #include <fstream>
 

modules/juce_audio_processors/format_types/juce_LV2PluginFormat.h

@@ -42,44 +42,9 @@ namespace juce
 
     @tags{Audio}
 */
-class JUCE_API LV2PluginFormat  : public AudioPluginFormat
+class JUCE_API LV2PluginFormat : public LV2PluginFormatHeadless
 {
-public:
-    LV2PluginFormat();
-    ~LV2PluginFormat() override;
-
-    static String getFormatName()       { return "LV2"; }
-    String getName() const override     { return getFormatName(); }
-
-    void findAllTypesForFile (OwnedArray<PluginDescription>& results,
-                              const String& fileOrIdentifier) override;
-
-    bool fileMightContainThisPluginType (const String& fileOrIdentifier) override;
-
-    String getNameOfPluginFromIdentifier (const String& fileOrIdentifier) override;
-
-    bool pluginNeedsRescanning (const PluginDescription&) override;
-
-    bool doesPluginStillExist (const PluginDescription&) override;
-
-    bool canScanForPlugins() const override;
-
-    bool isTrivialToScan() const override;
-
-    StringArray searchPathsForPlugins (const FileSearchPath& directoriesToSearch,
-                                       bool recursive,
-                                       bool allowPluginsWhichRequireAsynchronousInstantiation = false) override;
-
-    FileSearchPath getDefaultLocationsToSearch() override;
-
-private:
-    bool requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const override;
     void createPluginInstance (const PluginDescription&, double, int, PluginCreationCallback) override;
-
-    class Pimpl;
-    std::unique_ptr<Pimpl> pimpl;
-
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LV2PluginFormat)
 };
 
 #endif

modules/juce_audio_processors/format_types/juce_LV2PluginFormat_test.cpp

@@ -32,7 +32,7 @@
   ==============================================================================
 */
 
-#include "juce_LV2Common.h"
+#include <juce_audio_processors_headless/format_types/juce_LV2Common.h>
 
 namespace juce
 {

modules/juce_audio_processors_headless/format_types/juce_LV2PluginFormatHeadless.cpp

@@ -0,0 +1,104 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE framework.
+   Copyright (c) Raw Material Software Limited
+
+   JUCE is an open source framework subject to commercial or open source
+   licensing.
+
+   By downloading, installing, or using the JUCE framework, or combining the
+   JUCE framework with any other source code, object code, content or any other
+   copyrightable work, you agree to the terms of the JUCE End User Licence
+   Agreement, and all incorporated terms including the JUCE Privacy Policy and
+   the JUCE Website Terms of Service, as applicable, which will bind you. If you
+   do not agree to the terms of these agreements, we will not license the JUCE
+   framework to you, and you must discontinue the installation or download
+   process and cease use of the JUCE framework.
+
+   JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/
+   JUCE Privacy Policy: https://juce.com/juce-privacy-policy
+   JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/
+
+   Or:
+
+   You may also use this code under the terms of the AGPLv3:
+   https://www.gnu.org/licenses/agpl-3.0.en.html
+
+   THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL
+   WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
+
+  ==============================================================================
+*/
+
+#if JUCE_PLUGINHOST_LV2 && (! (JUCE_ANDROID || JUCE_IOS))
+
+#include <juce_audio_processors_headless/format_types/juce_LV2PluginFormatImpl.h>
+
+namespace juce
+{
+
+//==============================================================================
+LV2PluginFormatHeadless::LV2PluginFormatHeadless()
+    : pimpl (std::make_unique<Pimpl>()) {}
+
+LV2PluginFormatHeadless::~LV2PluginFormatHeadless() = default;
+
+void LV2PluginFormatHeadless::findAllTypesForFile (OwnedArray<PluginDescription>& results,
+                                                   const String& fileOrIdentifier)
+{
+    pimpl->findAllTypesForFile (results, fileOrIdentifier);
+}
+
+bool LV2PluginFormatHeadless::fileMightContainThisPluginType (const String& fileOrIdentifier)
+{
+    return pimpl->fileMightContainThisPluginType (fileOrIdentifier);
+}
+
+String LV2PluginFormatHeadless::getNameOfPluginFromIdentifier (const String& fileOrIdentifier)
+{
+    return pimpl->getNameOfPluginFromIdentifier (fileOrIdentifier);
+}
+
+bool LV2PluginFormatHeadless::pluginNeedsRescanning (const PluginDescription& desc)
+{
+    return pimpl->pluginNeedsRescanning (desc);
+}
+
+bool LV2PluginFormatHeadless::doesPluginStillExist (const PluginDescription& desc)
+{
+    return pimpl->doesPluginStillExist (desc);
+}
+
+bool LV2PluginFormatHeadless::canScanForPlugins() const { return true; }
+bool LV2PluginFormatHeadless::isTrivialToScan() const { return true; }
+
+StringArray LV2PluginFormatHeadless::searchPathsForPlugins (const FileSearchPath& directoriesToSearch,
+                                                            bool recursive,
+                                                            bool allowAsync)
+{
+    return pimpl->searchPathsForPlugins (directoriesToSearch, recursive, allowAsync);
+}
+
+FileSearchPath LV2PluginFormatHeadless::getDefaultLocationsToSearch()
+{
+    return pimpl->getDefaultLocationsToSearch();
+}
+
+bool LV2PluginFormatHeadless::requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const
+{
+    return false;
+}
+
+void LV2PluginFormatHeadless::createPluginInstance (const PluginDescription& desc,
+                                                    double sampleRate,
+                                                    int bufferSize,
+                                                    PluginCreationCallback callback)
+{
+    Pimpl::createPluginInstance<lv2_host::LV2AudioPluginInstanceHeadless> (*this, desc, sampleRate, bufferSize, std::move (callback));
+}
+
+} // namespace juce
+
+#endif

modules/juce_audio_processors_headless/format_types/juce_LV2PluginFormatHeadless.h

@@ -0,0 +1,89 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE framework.
+   Copyright (c) Raw Material Software Limited
+
+   JUCE is an open source framework subject to commercial or open source
+   licensing.
+
+   By downloading, installing, or using the JUCE framework, or combining the
+   JUCE framework with any other source code, object code, content or any other
+   copyrightable work, you agree to the terms of the JUCE End User Licence
+   Agreement, and all incorporated terms including the JUCE Privacy Policy and
+   the JUCE Website Terms of Service, as applicable, which will bind you. If you
+   do not agree to the terms of these agreements, we will not license the JUCE
+   framework to you, and you must discontinue the installation or download
+   process and cease use of the JUCE framework.
+
+   JUCE End User Licence Agreement: https://juce.com/legal/juce-8-licence/
+   JUCE Privacy Policy: https://juce.com/juce-privacy-policy
+   JUCE Website Terms of Service: https://juce.com/juce-website-terms-of-service/
+
+   Or:
+
+   You may also use this code under the terms of the AGPLv3:
+   https://www.gnu.org/licenses/agpl-3.0.en.html
+
+   THE JUCE FRAMEWORK IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL
+   WARRANTIES, WHETHER EXPRESSED OR IMPLIED, INCLUDING WARRANTY OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
+
+  ==============================================================================
+*/
+
+namespace juce
+{
+
+#if (JUCE_PLUGINHOST_LV2 && (! (JUCE_ANDROID || JUCE_IOS))) || DOXYGEN
+
+/**
+    Implements a plugin format for LV2 plugins.
+
+    @tags{Audio}
+*/
+class JUCE_API LV2PluginFormatHeadless  : public AudioPluginFormat
+{
+public:
+    LV2PluginFormatHeadless();
+    ~LV2PluginFormatHeadless() override;
+
+    static String getFormatName()       { return "LV2"; }
+    String getName() const override     { return getFormatName(); }
+
+    void findAllTypesForFile (OwnedArray<PluginDescription>& results,
+                              const String& fileOrIdentifier) override;
+
+    bool fileMightContainThisPluginType (const String& fileOrIdentifier) override;
+
+    String getNameOfPluginFromIdentifier (const String& fileOrIdentifier) override;
+
+    bool pluginNeedsRescanning (const PluginDescription&) override;
+
+    bool doesPluginStillExist (const PluginDescription&) override;
+
+    bool canScanForPlugins() const override;
+
+    bool isTrivialToScan() const override;
+
+    StringArray searchPathsForPlugins (const FileSearchPath& directoriesToSearch,
+                                       bool recursive,
+                                       bool allowPluginsWhichRequireAsynchronousInstantiation = false) override;
+
+    FileSearchPath getDefaultLocationsToSearch() override;
+
+    /** @internal */
+    class Pimpl;
+
+private:
+    bool requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const override;
+    void createPluginInstance (const PluginDescription&, double, int, PluginCreationCallback) override;
+
+    std::unique_ptr<Pimpl> pimpl;
+
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LV2PluginFormatHeadless)
+};
+
+#endif
+
+} // namespace juce

modules/juce_audio_processors_headless/format_types/juce_LV2Resources.h

@@ -56,7 +56,7 @@ struct Bundle
     const char* name;
     std::vector<BundleResource> contents;
 
-    static std::vector<Bundle> getAllBundles();
+    static inline std::vector<Bundle> getAllBundles();
 };
 
 } // namespace juce::lv2

modules/juce_audio_processors_headless/juce_audio_processors_headless.cpp

@@ -66,3 +66,4 @@
 #include <juce_audio_processors_headless/utilities/ARA/juce_ARA_utils.cpp>
 #include <juce_audio_processors_headless/format_types/juce_AudioUnitPluginFormatHeadless.mm>
 #include <juce_audio_processors_headless/format_types/juce_LADSPAPluginFormatHeadless.cpp>
+#include <juce_audio_processors_headless/format_types/juce_LV2PluginFormatHeadless.cpp>

modules/juce_audio_processors_headless/juce_audio_processors_headless.h

@@ -91,3 +91,4 @@
 #include <juce_audio_processors_headless/utilities/ARA/juce_ARA_utils.h>
 #include <juce_audio_processors_headless/format_types/juce_AudioUnitPluginFormatHeadless.h>
 #include <juce_audio_processors_headless/format_types/juce_LADSPAPluginFormatHeadless.h>
+#include <juce_audio_processors_headless/format_types/juce_LV2PluginFormatHeadless.h>

modules/juce_audio_processors_headless/juce_audio_processors_headless_lv2_libs.cpp

@@ -40,5 +40,5 @@
  #include <juce_core/system/juce_CompilerWarnings.h>
  #include <juce_core/system/juce_TargetPlatform.h>
 
- #include "format_types/juce_LV2SupportLibs.cpp"
+ #include <juce_audio_processors_headless/format_types/juce_LV2SupportLibs.cpp>
 #endif