A few changes that will be needed for 64 bit Mac compilability

src/AudioIO.cpp

@@ -890,7 +890,7 @@ class AudioThread {
    }
    static void *callback(void *p) {
       AudioThread *th = (AudioThread *)p;
-      return (void *)th->Entry();
+      return reinterpret_cast<void *>( th->Entry() );
    }
    void Run() {
       pthread_create(&mThread, NULL, callback, this);

src/effects/VST/VSTControlOSX.mm

@@ -109,7 +109,11 @@ bool VSTControl::Create(wxWindow *parent, VSTEffectLink *link)
    }
 #endif
 
-   if (!mView && !mHIView)
+   if (!mView
+#if !defined(_LP64)
+       && !mHIView
+#endif
+       )
    {
       return false;
    }

src/effects/VST/VSTEffect.cpp

@@ -1114,12 +1114,12 @@ void VSTEffect::BundleDeleter::operator() (void* p) const
       CFRelease(static_cast<CFBundleRef>(p));
 }
 
-void VSTEffect::ResourceDeleter::operator() (void *p) const
+void VSTEffect::ResourceHandle::reset()
 {
-   if (mpHandle) {
-      int resource = (int)p;
-      CFBundleCloseBundleResourceMap(mpHandle->get(), resource);
-   }
+   if (mpHandle)
+      CFBundleCloseBundleResourceMap(mpHandle, mNum);
+   mpHandle = nullptr;
+   mNum = 0;
 }
 #endif
 
@@ -2061,10 +2061,8 @@ bool VSTEffect::Load()
    mBundleRef = std::move(bundleRef);
 
    // Open the resource map ... some plugins (like GRM Tools) need this.
-   mResource = ResourceHandle {
-      reinterpret_cast<char*>(
-         CFBundleOpenBundleResourceMap(mBundleRef.get())),
-      ResourceDeleter{&mBundleRef}
+   mResource = ResourceHandle{
+      mBundleRef.get(), CFBundleOpenBundleResourceMap(mBundleRef.get())
    };
 
 #elif defined(__WXMSW__)
@@ -2267,7 +2265,7 @@ void VSTEffect::Unload()
    if (mModule)
    {
 #if defined(__WXMAC__)
-      mResource = ResourceHandle{};
+      mResource.reset();
       mBundleRef.reset();
 #endif
 

src/effects/VST/VSTEffect.h

@@ -302,15 +302,27 @@ private:
 
    BundleHandle mBundleRef;
 
-   struct ResourceDeleter {
-      const BundleHandle *mpHandle;
-      ResourceDeleter(const BundleHandle *pHandle = nullptr)
-         : mpHandle(pHandle) {}
-      void operator() (void*) const;
+   struct ResourceHandle {
+      ResourceHandle(
+         CFBundleRef pHandle = nullptr, CFBundleRefNum num = 0)
+      : mpHandle{ pHandle }, mNum{ num }
+      {}
+      ResourceHandle& operator=( ResourceHandle &&other )
+      {
+         if (this != &other) {
+            mpHandle = other.mpHandle;
+            mNum = other.mNum;
+            other.mpHandle = nullptr;
+            other.mNum = 0;
+         }
+         return *this;
+      }
+      ~ResourceHandle() { reset(); }
+      void reset();
+
+      CFBundleRef mpHandle{};
+      CFBundleRefNum mNum{};
    };
-   using ResourceHandle = std::unique_ptr<
-      char, ResourceDeleter
-   >;
    ResourceHandle mResource;
 #endif
 

src/effects/audiounits/AUControl.mm

@@ -173,12 +173,20 @@ bool AUControl::Create(wxWindow *parent, AudioComponent comp, AudioUnit unit, bo
 #endif
    }
 
-   if (!mView && !mHIView)
+   if (!mView
+#if !defined(_LP64)
+       && !mHIView
+#endif
+       )
    {
       CreateGeneric();
    }
 
-   if (!mView && !mHIView)
+   if (!mView
+#if !defined(_LP64)
+       && !mHIView
+#endif
+       )
    {
       return false;
    }
@@ -186,10 +194,12 @@ bool AUControl::Create(wxWindow *parent, AudioComponent comp, AudioUnit unit, bo
    // wxWidgets takes ownership so safenew
    SetPeer(safenew AUControlImpl(this, mAUView));
 
+#if !defined(_LP64)
    if (mHIView)
    {
       CreateCarbonOverlay();
    }
+#endif
 
    // Must get the size again since SetPeer() could cause it to change
    SetInitialSize(GetMinSize());