Fix lv2-plugin build, misc changes

source/backend/engine/CarlaEngineInternal.hpp

@@ -225,6 +225,14 @@ struct CarlaEngineProtectedData {
     CARLA_DECLARE_NON_COPY_STRUCT(CarlaEngineProtectedData)
 #endif
 
+    ~CarlaEngineProtectedData()
+    {
+        CARLA_ASSERT(curPluginCount == 0);
+        CARLA_ASSERT(maxPluginNumber == 0);
+        CARLA_ASSERT(nextPluginId == 0);
+        CARLA_ASSERT(plugins == nullptr);
+    }
+
     void doPluginRemove()
     {
         CARLA_ASSERT(curPluginCount > 0);
@@ -323,7 +331,7 @@ struct CarlaEngineProtectedData {
 
             if (lockWait)
             {
-                // block wait for unlock on proccessing side
+                // block wait for unlock on processing side
                 carla_stdout("ScopedPluginAction(%i) - blocking START", pluginId);
                 fData->nextAction.mutex.lock();
                 carla_stdout("ScopedPluginAction(%i) - blocking DONE", pluginId);

source/backend/engine/CarlaEngineOsc.hpp

@@ -93,7 +93,7 @@ public:
     // -------------------------------------------------------------------
 
 private:
-    CarlaEngine* const kEngine;
+    CarlaEngine* const fEngine;
 
     CarlaString fName;
 

source/backend/plugin/CarlaPluginInternal.hpp

@@ -38,7 +38,7 @@ CARLA_BACKEND_START_NAMESPACE
 
 // -----------------------------------------------------------------------
 
-const unsigned short MAX_MIDI_EVENTS = 512;
+const unsigned short kPluginMaxMidiEvents = 512;
 
 const unsigned int PLUGIN_HINT_HAS_MIDI_IN  = 0x1;
 const unsigned int PLUGIN_HINT_HAS_MIDI_OUT = 0x2;
@@ -634,10 +634,8 @@ struct CarlaPluginProtectedData {
 
 #ifdef CARLA_PROPER_CPP11_SUPPORT
     CarlaPluginProtectedData() = delete;
-    CarlaPluginProtectedData(CarlaPluginProtectedData&) = delete;
-    CarlaPluginProtectedData(const CarlaPluginProtectedData&) = delete;
+    CARLA_DECLARE_NON_COPY_STRUCT(CarlaPluginProtectedData)
 #endif
-    CARLA_LEAK_DETECTOR(CarlaPluginProtectedData)
 
     ~CarlaPluginProtectedData()
     {

source/backend/plugin/CarlaPluginThread.hpp

@@ -29,6 +29,8 @@ CARLA_BACKEND_START_NAMESPACE
 } // Fix editor indentation
 #endif
 
+// -----------------------------------------------------------------------
+
 class CarlaPluginThread : public Thread
 {
 public:
@@ -61,6 +63,8 @@ private:
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaPluginThread)
 };
 
+// -----------------------------------------------------------------------
+
 CARLA_BACKEND_END_NAMESPACE
 
 #endif // CARLA_PLUGIN_THREAD_HPP_INCLUDED

source/plugin/carla-native-lv2-export.cpp

@@ -250,7 +250,7 @@ void writePluginFile(const PluginDescriptor* const pluginDesc)
 
     text += "    lv2:requiredFeature <" LV2_BUF_SIZE__boundedBlockLength "> ,\n";
 
-    if (pluginDesc->hints & PLUGIN_NEEDS_STATIC_BUFFERS)
+    if (pluginDesc->hints & PLUGIN_NEEDS_FIXED_BUFFERS)
         text += "                        <" LV2_BUF_SIZE__fixedBlockLength "> ,\n";
 
     text += "                        <" LV2_OPTIONS__options "> ,\n";