From 70712312d6d07d13759d1e32c3e064629fd04a60 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 15 Feb 2014 17:52:16 +0000
Subject: [PATCH] Misc

---
 source/backend/plugin/NativePlugin.cpp                 |  6 +++---
 source/modules/Makefile                                |  2 ++
 source/modules/distrho/DistrhoUtils.hpp                |  1 +
 source/modules/native-plugins/juce-patchbay.cpp        | 10 +++++++---
 .../native-plugins/jucepluginhost/GraphEditorPanel.cpp |  8 ++++----
 source/modules/native-plugins/lfo.c                    |  2 ++
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp
index 8dad7d3f8..1c2a18f34 100644
--- a/source/backend/plugin/NativePlugin.cpp
+++ b/source/backend/plugin/NativePlugin.cpp
@@ -1843,16 +1843,16 @@ public:
 
         if (fDescriptor != nullptr && fDescriptor->dispatcher != nullptr)
         {
-            fDescriptor->dispatcher(fHandle, PLUGIN_OPCODE_BUFFER_SIZE_CHANGED, 0, newBufferSize, nullptr, 0.0f);
+            fDescriptor->dispatcher(fHandle, PLUGIN_OPCODE_BUFFER_SIZE_CHANGED, 0, static_cast<intptr_t>(newBufferSize), nullptr, 0.0f);
 
             if (fHandle2 != nullptr)
-                fDescriptor->dispatcher(fHandle2, PLUGIN_OPCODE_BUFFER_SIZE_CHANGED, 0, newBufferSize, nullptr, 0.0f);
+                fDescriptor->dispatcher(fHandle2, PLUGIN_OPCODE_BUFFER_SIZE_CHANGED, 0, static_cast<intptr_t>(newBufferSize), nullptr, 0.0f);
         }
     }
 
     void sampleRateChanged(const double newSampleRate) override
     {
-        CARLA_ASSERT_INT(newSampleRate > 0.0, (int)newSampleRate);
+        CARLA_ASSERT_INT(newSampleRate > 0.0, newSampleRate);
         carla_debug("NativePlugin::sampleRateChanged(%g)", newSampleRate);
 
         if (fDescriptor != nullptr && fDescriptor->dispatcher != nullptr)
diff --git a/source/modules/Makefile b/source/modules/Makefile
index 04fb75d7f..9109e18d5 100644
--- a/source/modules/Makefile
+++ b/source/modules/Makefile
@@ -204,6 +204,7 @@ lib%.so:
 
 clean:
 	rm -f *.a *.def *.dll *.dylib *.so
+	$(MAKE) clean -C audio_decoder
 	$(MAKE) clean -C native-plugins
 	$(MAKE) clean -C dgl
 	$(MAKE) clean -C jackbridge
@@ -216,6 +217,7 @@ clean:
 	$(MAKE) clean -C juce_events
 	$(MAKE) clean -C juce_graphics
 	$(MAKE) clean -C juce_gui_basics
+	$(MAKE) clean -C juce_gui_extra
 	$(MAKE) clean -C lilv
 	$(MAKE) clean -C rtaudio
 	$(MAKE) clean -C rtmidi
diff --git a/source/modules/distrho/DistrhoUtils.hpp b/source/modules/distrho/DistrhoUtils.hpp
index 0153e5ef4..eb400de4d 100644
--- a/source/modules/distrho/DistrhoUtils.hpp
+++ b/source/modules/distrho/DistrhoUtils.hpp
@@ -32,6 +32,7 @@
 #endif
 
 #ifdef DISTRHO_OS_WINDOWS
+# include <winsock2.h>
 # include <windows.h>
 #else
 # include <unistd.h>
diff --git a/source/modules/native-plugins/juce-patchbay.cpp b/source/modules/native-plugins/juce-patchbay.cpp
index 4ff1e6c3b..f9f199dc8 100644
--- a/source/modules/native-plugins/juce-patchbay.cpp
+++ b/source/modules/native-plugins/juce-patchbay.cpp
@@ -20,6 +20,13 @@
 #include "juce_audio_processors.h"
 #include "juce_gui_extra.h"
 
+// -----------------------------------------------------------------------
+
+namespace juce {
+#include "jucepluginhost/juce_MidiKeyboardComponent.h"
+#include "jucepluginhost/juce_MidiKeyboardComponent.cpp"
+}
+
 using namespace juce;
 
 // -----------------------------------------------------------------------
@@ -260,9 +267,6 @@ void carla_register_native_plugin_jucepatchbay()
 
 // -----------------------------------------------------------------------
 
-#include "jucepluginhost/juce_MidiKeyboardComponent.h"
-#include "jucepluginhost/juce_MidiKeyboardComponent.cpp"
-
 #include "jucepluginhost/FilterGraph.cpp"
 #include "jucepluginhost/InternalFilters.cpp"
 #include "jucepluginhost/GraphEditorPanel.cpp"
diff --git a/source/modules/native-plugins/jucepluginhost/GraphEditorPanel.cpp b/source/modules/native-plugins/jucepluginhost/GraphEditorPanel.cpp
index 009d12950..919600322 100644
--- a/source/modules/native-plugins/jucepluginhost/GraphEditorPanel.cpp
+++ b/source/modules/native-plugins/jucepluginhost/GraphEditorPanel.cpp
@@ -562,10 +562,10 @@ public:
         float x1, y1, x2, y2;
         getPoints (x1, y1, x2, y2);
 
-        const Rectangle<int> newBounds ((int) jmin (x1, x2) - 4,
-                                        (int) jmin (y1, y2) - 4,
-                                        (int) std::abs (x1 - x2) + 8,
-                                        (int) std::abs (y1 - y2) + 8);
+        const juce::Rectangle<int> newBounds ((int) jmin (x1, x2) - 4,
+                                              (int) jmin (y1, y2) - 4,
+                                              (int) std::abs (x1 - x2) + 8,
+                                              (int) std::abs (y1 - y2) + 8);
 
         if (newBounds != getBounds())
             setBounds (newBounds);
diff --git a/source/modules/native-plugins/lfo.c b/source/modules/native-plugins/lfo.c
index d1d9872ad..d849ef817 100644
--- a/source/modules/native-plugins/lfo.c
+++ b/source/modules/native-plugins/lfo.c
@@ -16,6 +16,8 @@
  */
 
 #include "CarlaNative.h"
+
+#include "CarlaDefines.h"
 #include "CarlaMIDI.h"
 
 #include <math.h>