Misc

source/backend/plugin/LinuxSamplerPlugin.cpp

@@ -53,7 +53,7 @@ class AudioOutputDevicePlugin : public AudioOutputDevice
 {
 public:
     AudioOutputDevicePlugin(const CarlaEngine* const engine, const CarlaPlugin* const plugin, const bool uses16Outs)
-        : AudioOutputDevice(std::map<String, DeviceCreationParameter*>()),
+        : AudioOutputDevice(std::map<std::string, DeviceCreationParameter*>()),
           kEngine(engine),
           kPlugin(plugin)
     {
@@ -86,7 +86,7 @@ public:
         return uint(kEngine->getSampleRate());
     }
 
-    String Driver() override
+    std::string Driver() override
     {
         return "AudioOutputDevicePlugin";
     }
@@ -96,6 +96,11 @@ public:
         return new AudioChannel(channelNr, nullptr, 0);
     }
 
+    // -------------------------------------------------------------------
+
+           bool isAutonomousDevice() override { return false; }
+    static bool isAutonomousDriver()          { return false; }
+
     // -------------------------------------------------------------------
     // Give public access to the RenderAudio call
 
@@ -130,7 +135,7 @@ class MidiInputDevicePlugin : public MidiInputDevice
 {
 public:
     MidiInputDevicePlugin(Sampler* const sampler)
-        : MidiInputDevice(std::map<String, DeviceCreationParameter*>(), sampler) {}
+        : MidiInputDevice(std::map<std::string, DeviceCreationParameter*>(), sampler) {}
 
     // -------------------------------------------------------------------
     // LinuxSampler virtual methods
@@ -138,7 +143,7 @@ public:
     void Listen()     override {}
     void StopListen() override {}
 
-    String Driver() override
+    std::string Driver() override
     {
         return "MidiInputDevicePlugin";
     }
@@ -148,6 +153,14 @@ public:
         return new MidiInputPortPlugin(this, int(Ports.size()));
     }
 
+    // -------------------------------------------------------------------
+
+           bool isAutonomousDevice() override { return false; }
+    static bool isAutonomousDriver()          { return false; }
+
+    // -------------------------------------------------------------------
+    // Easy MidiInputPortPlugin creation
+
     MidiInputPortPlugin* CreateMidiPortPlugin()
     {
         return new MidiInputPortPlugin(this, int(Ports.size()));

source/includes/CarlaDefines.h

@@ -62,7 +62,7 @@
 #elif defined(__cplusplus)
 # if __cplusplus >= 201103L || (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 && defined(__GXX_EXPERIMENTAL_CXX0X__)) || __has_extension(cxx_noexcept)
 #  define CARLA_PROPER_CPP11_SUPPORT
-#  if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 407) || (defined(__CLANG__) && ! __has_extension(cxx_override_control))
+#  if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 407 && ! defined(__clang__)) || (defined(__clang__) && ! __has_extension(cxx_override_control))
 #   define override // gcc4.7+ only
 #   define final    // gcc4.7+ only
 #  endif