Cleanup

source/backend/engine/CarlaEngineOsc.cpp

@@ -19,7 +19,6 @@
 
 #include "CarlaEngine.hpp"
 #include "CarlaPlugin.hpp"
-#include "CarlaMIDI.h"
 
 #ifndef BUILD_BRIDGE
 # include "CarlaBridgeUtils.hpp"

source/backend/engine/CarlaEngineThread.cpp

@@ -43,11 +43,11 @@ CarlaEngineThread::~CarlaEngineThread()
 
 void CarlaEngineThread::run()
 {
+    CARLA_SAFE_ASSERT_RETURN(fEngine != nullptr,);
     CARLA_ASSERT(fEngine->isRunning());
     carla_debug("CarlaEngineThread::run()");
 
     bool oscRegisted, needsSingleThread;
-    unsigned int i, count;
     float value;
 
     while (fEngine->isRunning() && ! threadShouldExit())
@@ -58,7 +58,7 @@ void CarlaEngineThread::run()
         oscRegisted = fEngine->isOscControlRegistered();
 #endif
 
-        for (i=0, count = fEngine->getCurrentPluginCount(); i < count; ++i)
+        for (unsigned int i=0, count = fEngine->getCurrentPluginCount(); i < count; ++i)
         {
             CarlaPlugin* const plugin(fEngine->getPluginUnchecked(i));
 
@@ -80,7 +80,7 @@ void CarlaEngineThread::run()
                 // -------------------------------------------------------
                 // Update parameter outputs
 
-                for (uint32_t j=0; j < plugin->getParameterCount(); ++j)
+                for (uint32_t j=0, pcount=plugin->getParameterCount(); j < pcount; ++j)
                 {
                     if (! plugin->isParameterOutput(j))
                         continue;
@@ -113,7 +113,7 @@ void CarlaEngineThread::run()
         }
 
         fEngine->idleOsc();
-        sleep(oscRegisted ? 30 : 50);
+        Thread::sleep(oscRegisted ? 30 : 50);
     }
 }
 

source/backend/engine/CarlaEngineThread.hpp

@@ -29,6 +29,8 @@ CARLA_BACKEND_START_NAMESPACE
 } // Fix editor indentation
 #endif
 
+// -----------------------------------------------------------------------
+
 class CarlaEngineThread : public Thread
 {
 public:
@@ -44,6 +46,8 @@ private:
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaEngineThread)
 };
 
+// -----------------------------------------------------------------------
+
 CARLA_BACKEND_END_NAMESPACE
 
 #endif // CARLA_ENGINE_THREAD_HPP_INCLUDED

source/bridges/qtcreator/carla-bridge-plugin.pro

@@ -41,8 +41,8 @@ PKGCONFIG += fluidsynth
 PKGCONFIG += linuxsampler
 
 # AudioFile
-DEFINES   += HAVE_FFMPEG
-PKGCONFIG += libavcodec libavformat libavutil sndfile
+# DEFINES   += HAVE_FFMPEG
+# PKGCONFIG += libavcodec libavformat libavutil sndfile
 
 # MidiFile
 PKGCONFIG += smf