More of bug 1338: avoid Mac hang with modal invocation of plugin...

... This required a separate set of changes and testing for the VST version of
SPAN, another for the AU version.

see commit c8e570797f1e7c76750b4a8f24d4fb97c612f7e6

src/effects/VST/VSTControlOSX.h

@@ -35,6 +35,7 @@ public:
    ~VSTControl();
 
    bool Create(wxWindow *parent, VSTEffectLink *link);
+   void Close();
 
 private:
    void CreateCocoa();

src/effects/VST/VSTControlOSX.mm

@@ -65,6 +65,11 @@ VSTControl::VSTControl()
 }
 
 VSTControl::~VSTControl()
+{
+   Close();
+}
+
+void VSTControl::Close()
 {
 #if !defined(_LP64)
    if (mWindowRef)

src/effects/VST/VSTEffect.cpp

@@ -1762,6 +1762,7 @@ bool VSTEffect::CloseUI()
 #ifdef __WX_EVTLOOP_BUSY_WAITING__
    wxEventLoop::SetBusyWaiting(false);
 #endif
+   mControl->Close();
 #endif
 
    mParent->RemoveEventHandler(this);

src/effects/audiounits/AUControl.h

@@ -33,6 +33,8 @@ public:
    AUControl();
    ~AUControl();
 
+   void Close();
+
    bool Create(wxWindow *parent, AudioComponent comp, AudioUnit unit, bool custom);
    void CreateCocoa();
    void CreateGeneric();

src/effects/audiounits/AUControl.mm

@@ -107,12 +107,18 @@ AUControl::AUControl()
 }
 
 AUControl::~AUControl()
+{
+   Close();
+}
+
+void AUControl::Close()
 {
 #if !defined(_LP64)
 
    if (mInstance)
    {
       AudioComponentInstanceDispose(mInstance);
+      mInstance = nullptr;
    }
 
 #endif
@@ -125,11 +131,13 @@ AUControl::~AUControl()
                       object:mView];
 
       [mView release];
+      mView = nullptr;
    }
 
    if (mAUView)
    {
       [mAUView release];
+      mAUView = nullptr;
    }
 }
 

src/effects/audiounits/AudioUnitEffect.cpp

@@ -1747,7 +1747,7 @@ bool AudioUnitEffect::PopulateUI(wxWindow *parent)
       {
          auto innerSizer = std::make_unique<wxBoxSizer>(wxVERTICAL);
 
-         innerSizer->Add(pControl.release(), 1, wxEXPAND);
+         innerSizer->Add((mpControl = pControl.release()), 1, wxEXPAND);
          container->SetSizer(innerSizer.release());
       }
 
@@ -1808,6 +1808,8 @@ bool AudioUnitEffect::CloseUI()
 #ifdef __WX_EVTLOOP_BUSY_WAITING__
    wxEventLoop::SetBusyWaiting(false);
 #endif
+   if (mpControl)
+      mpControl->Close(), mpControl = nullptr;
 #endif
 
    mParent->RemoveEventHandler(this);

src/effects/audiounits/AudioUnitEffect.h

@@ -211,6 +211,8 @@ private:
 
    AUEventListenerRef mEventListenerRef;
 
+   AUControl *mpControl{};
+
    friend class AudioUnitEffectExportDialog;
    friend class AudioUnitEffectImportDialog;
 };