From 8c4ebc7841270a8a4af894ba3761da308b64241e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Thu, 6 Feb 2014 12:53:23 +0000
Subject: [PATCH] Fix build

---
 source/backend/plugin/BridgePlugin.cpp |  9 +++++++++
 source/backend/plugin/CarlaPlugin.cpp  |  3 +++
 source/backend/plugin/JucePlugin.cpp   | 15 +++++++++------
 source/bridges/Makefile                |  6 ++++--
 source/plugin/Makefile                 | 10 ++++++----
 5 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/source/backend/plugin/BridgePlugin.cpp b/source/backend/plugin/BridgePlugin.cpp
index ffb753490..ad5c0c125 100644
--- a/source/backend/plugin/BridgePlugin.cpp
+++ b/source/backend/plugin/BridgePlugin.cpp
@@ -565,9 +565,18 @@ public:
     void showCustomUI(const bool yesNo) override
     {
         if (yesNo)
+        {
             osc_send_show(pData->osc.data);
+
+            if (pData->engine->getOptions().frontendWinId != 0)
+                pData->transientTryCounter = 1;
+        }
         else
+        {
+            pData->transientTryCounter = 0;
+
             osc_send_hide(pData->osc.data);
+        }
     }
 
     void idle() override
diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index 0d2468799..12611a089 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -1639,7 +1639,10 @@ void CarlaPlugin::updateOscData(const lo_address& source, const char* const url)
 
 #ifndef BUILD_BRIDGE
     if (pData->hints & PLUGIN_IS_BRIDGE)
+    {
+        carla_stdout("CarlaPlugin::updateOscData() - done");
         return;
+    }
 #endif
 
     osc_send_sample_rate(pData->osc.data, static_cast<float>(pData->engine->getSampleRate()));
diff --git a/source/backend/plugin/JucePlugin.cpp b/source/backend/plugin/JucePlugin.cpp
index dde83f4b9..736a5b556 100644
--- a/source/backend/plugin/JucePlugin.cpp
+++ b/source/backend/plugin/JucePlugin.cpp
@@ -655,7 +655,7 @@ protected:
     // -------------------------------------------------------------------
 
 public:
-    bool init(const char* const filename, const char* const name, const char* const label)
+    bool init(const char* const filename, const char* const name, const char* const label, const char* const format)
     {
         CARLA_SAFE_ASSERT_RETURN(pData->engine != nullptr, false);
 
@@ -698,15 +698,18 @@ public:
 #endif
 
         //fDesc.name = fDesc.descriptiveName = label;
-        //fDesc.pluginFormatName = "VST";
         fDesc.uid = 0; // TODO - set uid for shell plugins
         fDesc.fileOrIdentifier = jfilename;
+        fDesc.pluginFormatName = format;
 
-        fInstance = fFormat.createInstanceFromDescription(fDesc, 44100, 512);
+        fFormatManager.addDefaultFormats();
+
+        String error;
+        fInstance = fFormatManager.createPluginInstance(fDesc, 44100, 512, error);
 
         if (fInstance == nullptr)
         {
-            pData->engine->setLastError("Plugin failed to initialize");
+            pData->engine->setLastError(error.toRawUTF8());
             return false;
         }
 
@@ -768,8 +771,8 @@ public:
 
 private:
     PluginDescription    fDesc;
-    VSTPluginFormat      fFormat;
     AudioPluginInstance* fInstance;
+    AudioPluginFormatManager fFormatManager;
 
     AudioSampleBuffer fAudioBuffer;
     MidiBuffer        fMidiBuffer;
@@ -794,7 +797,7 @@ CarlaPlugin* CarlaPlugin::newJuce(const Initializer& init, const char* const for
 #ifdef HAVE_JUCE
     JucePlugin* const plugin(new JucePlugin(init.engine, init.id));
 
-    if (! plugin->init(init.filename, init.name, init.label))
+    if (! plugin->init(init.filename, init.name, init.label, format))
     {
         delete plugin;
         return nullptr;
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index 7a1f215a7..d2d66853c 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -440,7 +440,8 @@ LIBS_PLUGIN += \
 	../modules/juce_events.a \
 	../modules/juce_data_structures.a \
 	../modules/juce_graphics.a \
-	../modules/juce_gui_basics.a
+	../modules/juce_gui_basics.a \
+	../modules/juce_gui_extra.a
 endif
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
@@ -514,7 +515,8 @@ LIBS_NATIVE += \
 	../modules/juce_events.a \
 	../modules/juce_data_structures.a \
 	../modules/juce_graphics.a \
-	../modules/juce_gui_basics.a
+	../modules/juce_gui_basics.a \
+	../modules/juce_gui_extra.a
 endif
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index f9151eb22..0a182f802 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -53,6 +53,10 @@ endif
 # --------------------------------------------------------------
 # Coomon
 
+ifeq ($(HAVE_DGL),true)
+LINK_FLAGS += $(DGL_LIBS)
+endif
+
 ifeq ($(HAVE_JUCE),true)
 LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
 LINK_FLAGS += $(JUCE_CORE_LIBS)
@@ -60,10 +64,7 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
-endif
-
-ifeq ($(HAVE_DGL),true)
-LINK_FLAGS += $(DGL_LIBS)
+LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
 
 # --------------------------------------------------------------
@@ -109,6 +110,7 @@ LIBS += ../modules/juce_data_structures.a
 LIBS += ../modules/juce_events.a
 LIBS += ../modules/juce_graphics.a
 LIBS += ../modules/juce_gui_basics.a
+LIBS += ../modules/juce_gui_extra.a
 endif
 
 ifeq ($(HAVE_DGL),true)