NSViewComponent: divide out the desktop scale in resizeToFitView

modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp

@@ -326,8 +326,9 @@ static void addIfNotNull (OwnedArray<AudioIODeviceType>& list, AudioIODeviceType
 void AudioDeviceManager::createAudioDeviceTypes (OwnedArray<AudioIODeviceType>& list)
 {
     addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_WASAPI (WASAPIDeviceMode::shared));
-    addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_WASAPI (WASAPIDeviceMode::exclusive));
-    addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_WASAPI (WASAPIDeviceMode::sharedLowLatency));
+	// Acon Digital modification - no need for special WASAPI modes
+    //addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_WASAPI (WASAPIDeviceMode::exclusive));
+    //addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_WASAPI (WASAPIDeviceMode::sharedLowLatency));
     addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_DirectSound());
     addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_ASIO());
     addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_CoreAudio());
@@ -525,22 +526,23 @@ String AudioDeviceManager::initialiseFromXML (const XmlElement& xml,
     if (error.isNotEmpty() && selectDefaultDeviceOnFailure)
         error = initialise (numInputChansNeeded, numOutputChansNeeded, nullptr, false, preferredDefaultDeviceName);
 
-    enabledMidiInputs.clear();
+    // Disabled to avoid assert due to initialisation in background thread
+    //enabledMidiInputs.clear();
 
-    const auto midiInputs = [&]
-    {
-        Array<MidiDeviceInfo> result;
+    //const auto midiInputs = [&]
+    //{
+    //    Array<MidiDeviceInfo> result;
 
-        for (auto* c : xml.getChildWithTagNameIterator ("MIDIINPUT"))
-            result.add ({ c->getStringAttribute ("name"), c->getStringAttribute ("identifier") });
+    //    for (auto* c : xml.getChildWithTagNameIterator ("MIDIINPUT"))
+    //        result.add ({ c->getStringAttribute ("name"), c->getStringAttribute ("identifier") });
 
-        return result;
-    }();
+    //    return result;
+    //}();
 
-    const MidiDeviceInfo defaultOutputDeviceInfo (xml.getStringAttribute ("defaultMidiOutput"),
-                                                  xml.getStringAttribute ("defaultMidiOutputDevice"));
+    //const MidiDeviceInfo defaultOutputDeviceInfo (xml.getStringAttribute ("defaultMidiOutput"),
+    //                                              xml.getStringAttribute ("defaultMidiOutputDevice"));
 
-    openLastRequestedMidiDevices (midiInputs, defaultOutputDeviceInfo);
+    //openLastRequestedMidiDevices (midiInputs, defaultOutputDeviceInfo);
 
     return error;
 }
@@ -701,10 +703,17 @@ void AudioDeviceManager::scanDevicesIfNeeded()
     {
         listNeedsScanning = false;
 
+        // Acon Digital modification: createDeviceTypesIfNeeded() already scans every type it
+        // creates, so only rescan when the types were already there. Scanning twice on the very
+        // first call costs hundreds of milliseconds on Windows, where it means enumerating (and,
+        // for ASIO, loading) every installed driver a second time.
+        const auto deviceTypesAlreadyExisted = availableDeviceTypes.size() > 0;
+
         createDeviceTypesIfNeeded();
 
-        for (auto* type : availableDeviceTypes)
-            type->scanForDevices();
+        if (deviceTypesAlreadyExisted)
+            for (auto* type : availableDeviceTypes)
+                type->scanForDevices();
     }
 }
 
@@ -815,8 +824,23 @@ String AudioDeviceManager::setAudioDeviceSetup (const AudioDeviceSetup& newSetup
 
     if (newSetup != currentSetup)
         sendChangeMessage();
-    else if (currentAudioDevice != nullptr)
+    else if (currentAudioDevice != nullptr && currentAudioDevice->isOpen())
+    {
+        // Acon Digital modification: the setup is unchanged, so there is no need to re-open the
+        // device - but a caller may have stopped it in order to change the format of the audio it
+        // is about to play, so make sure it ends up running again rather than silently staying
+        // stopped. Restarting also gives the callback the audioDeviceAboutToStart() it needs to
+        // rebuild its converters. A device that is no longer open falls through to the re-open
+        // path below.
+        //
+        // Started unconditionally: stop() clears the callback but leaves the interrupt running,
+        // clearing the playing flag only when it also tears the IOProc down. isPlaying() can
+        // therefore be true with no callback attached, which left the device running silent.
+        // start() is idempotent - it reattaches a callback only when there is none.
+        currentAudioDevice->start (callbackHandler->getAudioIODeviceCallback());
+
         return {};
+    }
 
     stopDevice();
 

modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp

@@ -90,6 +90,11 @@ static_assert (AAX_SDK_CURRENT_REVISION >= AAX_SDK_2p6p1_REVISION, "JUCE require
 #include <AAX_Assert.h>
 #include <AAX_TransportTypes.h>
 
+#if JucePlugin_Enable_ARA
+#include <ARAAAX.h>
+#include <AAX_VARABinding.h>
+#endif
+
 JUCE_END_IGNORE_WARNINGS_MSVC
 JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 
@@ -681,6 +686,14 @@ namespace AAXClasses
             void mouseUp   (const MouseEvent& e) override  { callMouseMethod (e, &AAX_IViewContainer::HandleParameterMouseUp); }
             void mouseDrag (const MouseEvent& e) override  { callMouseMethod (e, &AAX_IViewContainer::HandleParameterMouseDrag); }
 
+           #if JucePlugin_Enable_ARA
+            void resized() override
+            {
+                if (pluginEditor != nullptr)
+                    pluginEditor->setBounds (getLocalBounds());
+            }
+           #endif
+
             void parentSizeChanged() override
             {
                 resizeHostWindow();
@@ -822,6 +835,14 @@ namespace AAXClasses
             return new JuceAAX_Processor();
         }
 
+       #if JucePlugin_Enable_ARA
+    	AAX_Result Initialize (IACFUnknown* iController) override
+        {
+        	aaxaraBinding.reset (new ARA::AAX_VARABinding (iController));
+            return AAX_CEffectParameters::Initialize (iController);
+        }
+       #endif
+
         AAX_Result Uninitialize() override
         {
             cancelPendingUpdate();
@@ -841,6 +862,36 @@ namespace AAXClasses
         AAX_Result EffectInit() override
         {
             cancelPendingUpdate();
+
+           #if JucePlugin_Enable_ARA
+	        ARA::ARAPlugInInstanceRoleFlags knownRoles = 0;
+	        auto result = aaxaraBinding->GetInstanceRoleFlags (&knownRoles, &assignedRoles);
+
+	        // If no ARA roles provided - work as a regular AAX plug-in
+	        if (result == AAX_SUCCESS)
+	        {
+		        assignedRoles &= (ARA::kARAPlaybackRendererRole | ARA::kARAEditorRendererRole | ARA::kARAEditorViewRole);
+		        if (assignedRoles)
+		        {
+			        result = aaxaraBinding->GetDocumentController (&documentControllerRef);
+			        if (result != AAX_SUCCESS)
+				        return result;
+
+			        auto araPluginExtension = dynamic_cast<AudioProcessorARAExtension*> (pluginInstance.get());
+			        if (!araPluginExtension)
+				        return AAX_ERROR_NULL_OBJECT;
+
+			        auto* const plugInEnxtensionInstance = araPluginExtension->bindToARA (documentControllerRef, knownRoles, assignedRoles);
+			        if (!plugInEnxtensionInstance)
+				        return AAX_ERROR_NULL_OBJECT;
+
+			        result = aaxaraBinding->SetPlugInExtensionInstance (plugInEnxtensionInstance);
+			        if (result != AAX_SUCCESS)
+				        return result;
+		        }
+	        }
+           #endif      
+
             check (Controller()->GetSampleRate (&sampleRate));
             processingSidechainChange = false;
             auto err = preparePlugin();
@@ -2284,6 +2335,12 @@ namespace AAXClasses
             std::atomic<int> state { 0 };
         };
 
+       #if JucePlugin_Enable_ARA
+        std::unique_ptr<ARA::AAX_VARABinding> aaxaraBinding;
+	    ARA::ARADocumentControllerRef documentControllerRef;
+	    ARA::ARAPlugInInstanceRoleFlags assignedRoles;
+       #endif
+
         RecordingState recordingState;
 
         std::atomic<bool> processingSidechainChange, sidechainDesired;
@@ -2486,7 +2543,7 @@ namespace AAXClasses
 
         properties->AddProperty (AAX_eProperty_PlugInID_Native, pluginID);
 
-       #if ! JucePlugin_AAXDisableAudioSuite
+       #if ! (JucePlugin_AAXDisableAudioSuite || JucePlugin_Enable_ARA)
         properties->AddProperty (AAX_eProperty_PlugInID_AudioSuite,
                                  extensions.getPluginIDForMainBusConfig (fullLayout.getMainInputChannelSet(),
                                                                          fullLayout.getMainOutputChannelSet(),
@@ -2548,6 +2605,13 @@ namespace AAXClasses
             }
         }
 
+       #if JucePlugin_Enable_ARA
+        properties->AddProperty (AAX_eProperty_ShowInMenus, false);
+	    properties->AddProperty (AAX_eProperty_UsesTransport, true);
+        properties->AddProperty (AAX_eProperty_Constraint_Topology, AAX_eConstraintTopology_Monolithic);
+        properties->AddPointerProperty (ARA::AAX_eProperty_ARAFactoryPointer, createARAFactory());
+       #endif
+
         check (desc.AddProcessProc_Native (algorithmProcessCallback, properties));
     }
 
@@ -2639,6 +2703,35 @@ void AAX_CALLBACK AAXClasses::algorithmProcessCallback (JUCEAlgorithmContext* co
     AAXClasses::JuceAAX_Processor::algorithmCallback (instancesBegin, instancesEnd);
 }
 
+static bool HostDeclaresARASupport(AAX_ICollection* inCollection)
+{
+	bool result = false;
+	const AAX_IDescriptionHost* const hostDesc = inCollection->DescriptionHost();
+	if (hostDesc)
+	{
+		std::unique_ptr<const AAX_IFeatureInfo> featureInfo(hostDesc->AcquireFeatureProperties(AAXATTR_ClientFeature_ARA));
+		if (featureInfo)
+		{
+			AAX_ESupportLevel featureSupportLevel = AAX_eSupportLevel_Uninitialized;
+			const AAX_Result err = featureInfo->SupportLevel(featureSupportLevel);
+			AAX_TRACE_RELEASE(kAAX_Trace_Priority_Normal, "ARA initialization: host support for ARA: %s, err: %ld",
+			                    AAX::AsStringSupportLevel(featureSupportLevel).c_str(), (long int)err);
+			result = (err == AAX_SUCCESS) && (featureSupportLevel == AAX_eSupportLevel_Supported);
+		}
+		else
+		{
+			AAX_TRACE_RELEASE(kAAX_Trace_Priority_Normal, "ARA initialization: Unable to query AAXATTR_ClientFeature_ARA");
+			result = false;
+		}
+	}
+	else
+	{
+		AAX_TRACE_RELEASE(kAAX_Trace_Priority_High, "ARA initialization: AAX_IDescriptionHost is null");
+		result = false;
+	}
+	return result;
+}
+
 //==============================================================================
 AAX_Result JUCE_CDECL GetEffectDescriptions (AAX_ICollection*);
 AAX_Result JUCE_CDECL GetEffectDescriptions (AAX_ICollection* collection)
@@ -2652,6 +2745,11 @@ AAX_Result JUCE_CDECL GetEffectDescriptions (AAX_ICollection* collection)
 
     if (auto* descriptor = collection->NewDescriptor())
     {
+       #if JucePlugin_Enable_ARA
+        if (!HostDeclaresARASupport(collection))
+	        return AAX_SUCCESS;
+       #endif
+
         AAXClasses::getPlugInDescription (*descriptor, stemFormatFeatureInfo.get());
         collection->AddEffect (JUCE_STRINGIFY (JucePlugin_AAXIdentifier), descriptor);
 

modules/juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp

@@ -2302,7 +2302,22 @@ class JuceVST3EditController final : public Vst::EditController,
 
             void createEditor (AudioProcessor& plugin)
             {
-                pluginEditor.reset (plugin.createEditorAndMakeActive());
+                // Acon Digital modification - Quick fix, may be fixed in a newer JUCE version (> 8.0.13).
+                if (detail::PluginUtilities::getHostType().isPremiere())
+                    if (auto* active = plugin.getActiveEditor())
+                    {
+                        auto* preflight = dynamic_cast<ContentWrapperComponent*> (active->getParentComponent());
+                        if (preflight != nullptr && preflight->pluginEditor.get() == active)
+                        {
+                            active->setHostContext (nullptr);
+                            preflight->editorHostContext.reset();
+                            pluginEditor = std::move (preflight->pluginEditor);
+                        }
+                    }
+
+                if (pluginEditor == nullptr)
+                    pluginEditor.reset (plugin.createEditorAndMakeActive());
+                // Acon Digital modification - End of modification
 
                #if JucePlugin_Enable_ARA
                 jassert (pluginEditor->getARAClientExtensions() != nullptr);

modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h

@@ -45,6 +45,22 @@ namespace juce
 */
 class JUCE_API AudioUnitPluginFormat : public AudioUnitPluginFormatHeadless
 {
+public:
+    //==============================================================================
+    /** Attempts to reload an AU plugin's state from some preset file data.
+
+        @see VSTPluginFormat::loadFromFXBFile
+    */
+    static bool setStateFromAUPresetFile (AudioPluginInstance*, const MemoryBlock&);
+
+    //==============================================================================
+    /** Attempts to save an AU plugin's state to some preset file data.
+
+        @see VSTPluginFormat::saveToFXBFile
+    */
+    static bool saveStateToAUPresetFile (AudioPluginInstance*, MemoryBlock&);
+
+private:
     void createPluginInstance (const PluginDescription&, double, int, PluginCreationCallback) override;
 };
 

modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.mm

@@ -285,6 +285,74 @@ bool hasEditor() const override
     createAudioUnitPluginInstance<AudioUnitPluginInstance> (*this, desc, rate, blockSize, callback);
 }
 
+bool AudioUnitPluginFormat::setStateFromAUPresetFile (AudioPluginInstance* api, const MemoryBlock& rawData)
+{
+    auto* auClient = api->getAudioUnitClient();
+    jassert (auClient != nullptr);
+    AudioUnit audioUnit = auClient->getAudioUnitHandle();
+
+    CFReadStreamRef stream = CFReadStreamCreateWithBytesNoCopy (kCFAllocatorDefault, (const UInt8*) rawData.getData(),
+                                                                rawData.getSize(), kCFAllocatorNull);
+    CFReadStreamOpen (stream);
+
+    CFPropertyListFormat format = kCFPropertyListBinaryFormat_v1_0;
+    CFPropertyListRef propertyList = CFPropertyListCreateFromStream (kCFAllocatorDefault, stream, 0,
+                                                                     kCFPropertyListImmutable, &format, 0);
+    CFRelease (stream);
+
+    if (propertyList != 0)
+    {
+        AudioUnitSetProperty (audioUnit, kAudioUnitProperty_ClassInfo, kAudioUnitScope_Global,
+                              0, &propertyList, sizeof (propertyList));
+
+        AudioUnitParameter param;
+        param.mAudioUnit = audioUnit;
+        param.mParameterID = kAUParameterListener_AnyParameter;
+
+        AUParameterListenerNotify (nullptr, nullptr, &param);
+
+        CFRelease (propertyList);
+        return true;
+    }
+
+    return false;
+}
+
+bool AudioUnitPluginFormat::saveStateToAUPresetFile (AudioPluginInstance* api, MemoryBlock& rawData)
+{
+    auto* auClient = api->getAudioUnitClient();
+    jassert (auClient != nullptr);
+    AudioUnit audioUnit = auClient->getAudioUnitHandle();
+
+    CFPropertyListRef propertyList = 0;
+    UInt32 sz = sizeof (CFPropertyListRef);
+
+    if (AudioUnitGetProperty (audioUnit,
+                              kAudioUnitProperty_ClassInfo,
+                              kAudioUnitScope_Global,
+                              0, &propertyList, &sz) == noErr)
+    {
+        CFWriteStreamRef stream = CFWriteStreamCreateWithAllocatedBuffers (kCFAllocatorDefault, kCFAllocatorDefault);
+        CFWriteStreamOpen (stream);
+
+        CFIndex bytesWritten = CFPropertyListWriteToStream (propertyList, stream, kCFPropertyListBinaryFormat_v1_0, 0);
+        CFWriteStreamClose (stream);
+
+        CFDataRef data = (CFDataRef) CFWriteStreamCopyProperty (stream, kCFStreamPropertyDataWritten);
+
+        rawData.setSize ((size_t) bytesWritten);
+        rawData.copyFrom (CFDataGetBytePtr (data), 0, bytesWritten);
+        CFRelease (data);
+
+        CFRelease (stream);
+        CFRelease (propertyList);
+
+        return true;
+    }
+
+    return false;
+}
+
 } // namespace juce
 
 #endif

modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp

@@ -825,4 +825,4 @@ void VSTPluginFormat::createPluginInstance (const PluginDescription& desc,
 
 } // namespace juce
 
-#endif
+#endif

modules/juce_audio_processors_headless/format_types/juce_LV2PluginFormatHeadless.cpp

@@ -86,6 +86,11 @@ FileSearchPath LV2PluginFormatHeadless::getDefaultLocationsToSearch()
     return pimpl->getDefaultLocationsToSearch();
 }
 
+StringArray LV2PluginFormatHeadless::getPluginUrisInBundle (const String& bundlePath)
+{
+    return pimpl->getPluginUrisInBundle (bundlePath);
+}
+
 bool LV2PluginFormatHeadless::requiresUnblockedMessageThreadDuringCreation (const PluginDescription&) const
 {
     return false;