Misc changes

source/backend/CarlaPlugin.hpp

@@ -19,13 +19,13 @@
 #define __CARLA_PLUGIN_HPP__
 
 #include "CarlaBackend.hpp"
-#include "CarlaNative.h"
 #include "CarlaString.hpp"
 
 #ifndef DOXYGEN
 // Avoid including extra libs here
 struct LADSPA_RDF_Descriptor;
 typedef void* lo_address;
+typedef struct _PluginDescriptor PluginDescriptor;
 #endif
 
 CARLA_BACKEND_START_NAMESPACE

source/backend/native/distrho-notes.cpp

@@ -21,17 +21,11 @@
 #include "notes/DistrhoPluginNotes.cpp"
 #include "notes/DistrhoUINotes.cpp"
 
-// FIXME - link to widgets
-#include "notes/ParamProgressBar.cpp"
-#include "moc_ParamProgressBar.cpp"
-
 // Carla DISTRHO Plugin
 #include "distrho/DistrhoPluginCarla.cpp"
 
 START_NAMESPACE_DISTRHO
 
-#include "moc_DistrhoUINotes.cpp"
-
 // -----------------------------------------------------------------------
 
 static const PluginDescriptor notesDesc = {

source/backend/native/notes/DistrhoUINotes.cpp

@@ -17,10 +17,15 @@
 
 #include "DistrhoUINotes.hpp"
 
+#include "notes/ParamProgressBar.cpp"
+#include "moc_ParamProgressBar.cpp"
+
 #include <QtGui/QResizeEvent>
 
 START_NAMESPACE_DISTRHO
 
+#include "moc_DistrhoUINotes.cpp"
+
 // -------------------------------------------------
 
 DistrhoUINotes::DistrhoUINotes()

source/libs/distrho/DistrhoPlugin.hpp

@@ -19,6 +19,8 @@
 
 #include "DistrhoUtils.hpp"
 
+#include <cstdint>
+
 START_NAMESPACE_DISTRHO
 
 // -------------------------------------------------

source/libs/distrho/DistrhoUI.hpp

@@ -19,6 +19,8 @@
 
 #include "DistrhoUtils.hpp"
 
+#include <cstdint>
+
 START_NAMESPACE_DISTRHO
 
 // -------------------------------------------------

source/libs/distrho/dgl/Base.hpp

@@ -56,44 +56,44 @@
 // -------------------------------------------------
 
 enum Char {
-    CHAR_BACKSPACE = 0x08,
-    CHAR_ESCAPE    = 0x1B,
-    CHAR_DELETE    = 0x7F
+    DGL_CHAR_BACKSPACE = 0x08,
+    DGL_CHAR_ESCAPE    = 0x1B,
+    DGL_CHAR_DELETE    = 0x7F
 };
 
 enum Key {
-    KEY_F1 = 1,
-    KEY_F2,
-    KEY_F3,
-    KEY_F4,
-    KEY_F5,
-    KEY_F6,
-    KEY_F7,
-    KEY_F8,
-    KEY_F9,
-    KEY_F10,
-    KEY_F11,
-    KEY_F12,
-    KEY_LEFT,
-    KEY_UP,
-    KEY_RIGHT,
-    KEY_DOWN,
-    KEY_PAGE_UP,
-    KEY_PAGE_DOWN,
-    KEY_HOME,
-    KEY_END,
-    KEY_INSERT,
-    KEY_SHIFT,
-    KEY_CTRL,
-    KEY_ALT,
-    KEY_SUPER
+    DGL_KEY_F1 = 1,
+    DGL_KEY_F2,
+    DGL_KEY_F3,
+    DGL_KEY_F4,
+    DGL_KEY_F5,
+    DGL_KEY_F6,
+    DGL_KEY_F7,
+    DGL_KEY_F8,
+    DGL_KEY_F9,
+    DGL_KEY_F10,
+    DGL_KEY_F11,
+    DGL_KEY_F12,
+    DGL_KEY_LEFT,
+    DGL_KEY_UP,
+    DGL_KEY_RIGHT,
+    DGL_KEY_DOWN,
+    DGL_KEY_PAGE_UP,
+    DGL_KEY_PAGE_DOWN,
+    DGL_KEY_HOME,
+    DGL_KEY_END,
+    DGL_KEY_INSERT,
+    DGL_KEY_SHIFT,
+    DGL_KEY_CTRL,
+    DGL_KEY_ALT,
+    DGL_KEY_SUPER
 };
 
 enum Modifier {
-    MODIFIER_SHIFT = 1 << 0, /**< Shift key */
-    MODIFIER_CTRL  = 1 << 1, /**< Control key */
-    MODIFIER_ALT   = 1 << 2, /**< Alt/Option key */
-    MODIFIER_SUPER = 1 << 3  /**< Mod4/Command/Windows key */
+    DGL_MODIFIER_SHIFT = 1 << 0, /**< Shift key */
+    DGL_MODIFIER_CTRL  = 1 << 1, /**< Control key */
+    DGL_MODIFIER_ALT   = 1 << 2, /**< Alt/Option key */
+    DGL_MODIFIER_SUPER = 1 << 3  /**< Mod4/Command/Windows key */
 };
 
 static inline

source/libs/distrho/src/DistrhoUIInternal.hpp

@@ -256,7 +256,7 @@ public:
     {
 #ifdef DISTRHO_UI_QT4
         assert(qtWidget != nullptr);
-        return (qtWidget != nullptr) ? qtWidget->winId() : 0;
+        return (qtWidget != nullptr) ? (intptr_t)qtWidget->winId() : 0;
 #else
         return glWindow.getWindowId();
 #endif
@@ -309,7 +309,7 @@ public:
         }
 
         // reparent widget
-        qtWidget->embedInto(parent);
+        qtWidget->embedInto((WId)parent);
 
         // show it
         qtWidget->show();