Misc fixes and small changes needed for OSX

data/macos/build.sh

@@ -29,7 +29,7 @@ export LDFLAGS="-m64"
 export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
 
-make $JOBS
+make HAVE_DGL=false $JOBS
 
 ##############################################################################################
 # Build 32bit bridges
@@ -41,12 +41,12 @@ export LDFLAGS="-m32"
 export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig
 
-make posix32 $JOBS
+make HAVE_DGL=false posix32 $JOBS
 
 ##############################################################################################
 # Build Mac App
 
-export PATH=/opt/carla/bin:/opt/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PYTHONPATH=`pwd`/source
 unset CFLAGS
 unset CXXFLAGS

data/macos/bundle.py

@@ -14,8 +14,9 @@ from carla_host import VERSION
 
 # ------------------------------------------------------------------------------------------------------------
 
-options  = {
+options = {
   "packages": ["re", "sip", "subprocess", "inspect"],
+  "excludes": ["PyQt5.QtNetwork", "PyQt5.QtSql", "PyQt5.QtTest", "PyQt5.QtXml", "XCTest"],
   "create_shared_zip":    False,
   "append_script_to_exe": True,
   "optimize":   True,

source/backend/engine/CarlaEngineBridge.cpp

@@ -537,7 +537,7 @@ public:
         return kEngineTypeBridge;
     }
 
-    const char* getCurrentDriverName() const noexcept
+    const char* getCurrentDriverName() const noexcept override
     {
         return "Bridge";
     }

source/backend/engine/CarlaEngineJuce.cpp

@@ -22,7 +22,7 @@
 
 #include "RtLinkedList.hpp"
 
-#include "juce_audio_devices.h"
+#include "juce_audio_devices/juce_audio_devices.h"
 
 using namespace juce;
 

source/backend/plugin/CarlaPluginJuce.cpp

@@ -46,7 +46,6 @@ public:
           fMidiBuffer(),
           fPosInfo(),
           fChunk(),
-          fUniqueId(nullptr),
           fWindow()
     {
         carla_debug("CarlaPluginJuce::CarlaPluginJuce(%p, %i)", engine, id);
@@ -1248,8 +1247,6 @@ private:
     CurrentPositionInfo fPosInfo;
     MemoryBlock         fChunk;
 
-    const char* fUniqueId;
-
     ScopedPointer<JucePluginWindow> fWindow;
 
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginJuce)

source/backend/plugin/CarlaPluginLV2.cpp

@@ -520,7 +520,7 @@ public:
           fParamBuffers(nullptr),
           fCanInit2(true),
           fNeedsUiClose(false),
-          fLatencyChanged(false),
+          //fLatencyChanged(false),
           fLatencyIndex(-1),
           fAtomBufferIn(),
           fAtomBufferOut(),
@@ -5550,7 +5550,7 @@ private:
 
     bool    fCanInit2; // some plugins don't like 2 instances
     bool    fNeedsUiClose;
-    bool    fLatencyChanged;
+    //bool    fLatencyChanged;
     int32_t fLatencyIndex; // -1 if invalid
 
     Lv2AtomRingBuffer fAtomBufferIn;

source/bridges-ui/CarlaBridgeToolkitPlugin.cpp

@@ -21,7 +21,7 @@
 #include "CarlaPluginUI.hpp"
 
 #if defined(CARLA_OS_WIN) || defined(CARLA_OS_MAC)
-# include "juce_events.h"
+# include "juce_events/juce_events.h"
 using juce::MessageManager;
 using juce::ScopedJuceInitialiser_GUI;
 #endif

source/carla_backend.py

@@ -2082,6 +2082,12 @@ class CarlaHostNull(CarlaHostMeta):
     def get_host_osc_url_udp(self):
         return ""
 
+    def nsm_init(self, pid, executableName):
+        return False
+
+    def nsm_ready(self, action):
+        return
+
 # ------------------------------------------------------------------------------------------------------------
 # Carla Host object using a DLL
 

source/modules/distrho/DistrhoUtils.hpp

@@ -33,7 +33,7 @@
 # include <stdint.h>
 #endif
 
-#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC)
+#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! defined(DISTRHO_PROPER_CPP11_SUPPORT)
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }

source/modules/distrho/src/DistrhoPluginCarla.cpp

@@ -42,7 +42,6 @@ class UICarla
 public:
     UICarla(const NativeHostDescriptor* const host, PluginExporter* const plugin)
         : fHost(host),
-          fPlugin(plugin),
           fUI(this, 0, editParameterCallback, setParameterCallback, setStateCallback, sendNoteCallback, setSizeCallback, plugin->getInstancePointer())
     {
         fUI.setWindowTitle(host->uiName);
@@ -125,7 +124,6 @@ protected:
 private:
     // Plugin stuff
     const NativeHostDescriptor* const fHost;
-    PluginExporter* const fPlugin;
 
     // UI
     UIExporter fUI;

source/theme/CarlaStyleAnimations.hpp

@@ -98,7 +98,7 @@ protected:
         return currentTime() > _delay;
     }
 
-    virtual void updateCurrentTime(int /*time*/)
+    virtual void updateCurrentTime(int /*time*/) override
     {
         if (QObject* tgt = target())
         {

source/utils/CarlaMathUtils.hpp

@@ -201,9 +201,9 @@ void carla_zeroFloats(float floats[], const std::size_t count) noexcept
 }
 
 // --------------------------------------------------------------------------------------------------------------------
-// Missing functions in OSX.
+// Missing functions in old OSX versions.
 
-#if 0 // defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC)
+#if defined(CARLA_OS_MAC) && ! defined(DISTRHO_OS_MAC) && ! defined(CARLA_PROPER_CPP11_SUPPORT)
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }

source/utils/CarlaPluginUI.cpp

@@ -47,6 +47,7 @@ struct NSView;
 # endif
 
 namespace juce {
+
 //==============================================================================
 struct AutoResizingNSViewComponent : public NSViewComponent,
                                      private AsyncUpdater {
@@ -65,12 +66,10 @@ struct AutoResizingNSViewComponentWithParent : public AutoResizingNSViewComponen
 
 //==============================================================================
 # ifdef CARLA_PLUGIN_UI_WITHOUT_JUCE_PROCESSORS
-#  include "juce_core/native/juce_BasicNativeHeaders.h"
-
 AutoResizingNSViewComponent::AutoResizingNSViewComponent()
     : recursive (false) {}
 
-void AutoResizingNSViewComponent::childBoundsChanged(Component*) override
+void AutoResizingNSViewComponent::childBoundsChanged(Component*) /* override */
 {
     if (recursive)
     {
@@ -84,7 +83,7 @@ void AutoResizingNSViewComponent::childBoundsChanged(Component*) override
     }
 }
 
-void AutoResizingNSViewComponent::handleAsyncUpdate() override
+void AutoResizingNSViewComponent::handleAsyncUpdate() /* override */
 {
     resizeToFitView();
 }
@@ -107,7 +106,7 @@ NSView* AutoResizingNSViewComponentWithParent::getChildView() const
     return nil;
 }
 
-void AutoResizingNSViewComponentWithParent::timerCallback() override
+void AutoResizingNSViewComponentWithParent::timerCallback() /* override */
 {
     if (NSView* child = getChildView())
     {
@@ -115,9 +114,11 @@ void AutoResizingNSViewComponentWithParent::timerCallback() override
         setView(child);
     }
 }
-#endif
+# endif
+
 } // namespace juce
 using juce::AutoResizingNSViewComponentWithParent;
+
 #endif
 
 // -----------------------------------------------------