DISTRHO
/
DISTRHO-Ports
mirror of https://github.com/DISTRHO/DISTRHO-Ports
1
0
Fork 0
Code Releases 5 Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
366 Commits
6 Branches
885MB
Tree: f591a1066c
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'f591a1066c'
${ noResults }
DISTRHO-Ports/libs/juce/patches/linux-embed.patch

265 lines
7.7KB
Raw Blame History 

  1. diff --git a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp

  2. index 2f4b727..97e8a96 100644

  3. --- a/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp

  4. +++ b/modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp

  5. @@ -52,7 +52,7 @@

  6.   #define JucePlugin_WantsLV2State 1

  7.  #endif

  8.  

  9. -#if JUCE_LINUX

  10. +#if JUCE_LINUX && ! JUCE_LINUX_EMBED

  11.   #include <X11/Xlib.h>

  12.   #undef KeyPress

  13.  #endif

  14. @@ -79,12 +79,12 @@

  15.  

  16.  #include "../utility/juce_IncludeModuleHeaders.h"

  17.  

  18. +#if JUCE_LINUX && ! JUCE_LINUX_EMBED

  19.  namespace juce

  20.  {

  21. - #if JUCE_LINUX

  22.    extern Display* display;

  23. - #endif

  24.  }

  25. +#endif

  26.  

  27.  #define JUCE_LV2_STATE_STRING_URI "urn:juce:stateString"

  28.  #define JUCE_LV2_STATE_BINARY_URI "urn:juce:stateBinary"

  29. @@ -200,6 +200,7 @@ const String makeManifestFile (AudioProcessor* const filter, const String& binar

  30.      text += "    rdfs:seeAlso <" + binary + ".ttl> .\n";

  31.      text += "\n";

  32.  

  33. +#if ! JUCE_LINUX_EMBED

  34.      // UIs

  35.      if (filter->hasEditor())

  36.      {

  37. @@ -211,19 +212,20 @@ const String makeManifestFile (AudioProcessor* const filter, const String& binar

  38.          text += "\n";

  39.  

  40.          text += "<" + pluginURI + "#ParentUI>\n";

  41. -#if JUCE_MAC

  42. + #if JUCE_MAC

  43.          text += "    a ui:CocoaUI ;\n";

  44. -#elif JUCE_LINUX

  45. + #elif JUCE_LINUX

  46.          text += "    a ui:X11UI ;\n";

  47. -#elif JUCE_WINDOWS

  48. + #elif JUCE_WINDOWS

  49.          text += "    a ui:WindowsUI ;\n";

  50. -#endif

  51. + #endif

  52.          text += "    ui:binary <" + binary + PLUGIN_EXT "> ;\n";

  53.          text += "    lv2:requiredFeature <" LV2_INSTANCE_ACCESS_URI "> ;\n";

  54.          text += "    lv2:optionalFeature ui:noUserResize ;\n";

  55.          text += "    lv2:extensionData <" LV2_PROGRAMS__UIInterface "> .\n";

  56.          text += "\n";

  57.      }

  58. +#endif

  59.  

  60.  #if JucePlugin_WantsLV2Presets

  61.      const String presetSeparator(pluginURI.contains("#") ? ":" : "#");

  62. @@ -273,6 +275,7 @@ const String makePluginFile (AudioProcessor* const filter, const int maxNumInput

  63.      text += "                      <" LV2_PROGRAMS__Interface "> ;\n";

  64.      text += "\n";

  65.  

  66. +#if ! JUCE_LINUX_EMBED

  67.      // UIs

  68.      if (filter->hasEditor())

  69.      {

  70. @@ -280,6 +283,7 @@ const String makePluginFile (AudioProcessor* const filter, const int maxNumInput

  71.          text += "          <" + pluginURI + "#ParentUI> ;\n";

  72.          text += "\n";

  73.      }

  74. +#endif

  75.  

  76.      uint32 portIndex = 0;

  77.  

  78. @@ -570,6 +574,7 @@ private:

  79.  };

  80.  #endif

  81.  

  82. +#if ! JUCE_LINUX_EMBED

  83.  //==============================================================================

  84.  /**

  85.      Lightweight DocumentWindow subclass for external ui

  86. @@ -1105,6 +1110,8 @@ private:

  87.      JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceLv2UIWrapper)

  88.  };

  89.  

  90. +#endif /* JUCE_LINUX_EMBED */

  91. +

  92.  //==============================================================================

  93.  /**

  94.      Juce LV2 handle

  95. @@ -1249,7 +1256,9 @@ public:

  96.      {

  97.          const MessageManagerLock mmLock;

  98.  

  99. +#if ! JUCE_LINUX_EMBED

  100.          ui = nullptr;

  101. +#endif

  102.          filter = nullptr;

  103.  

  104.          if (progDesc.name != nullptr)

  105. @@ -1818,8 +1827,10 @@ public:

  106.              String stateData (CharPointer_UTF8(static_cast<const char*>(data)));

  107.              filter->setStateInformationString (stateData);

  108.  

  109. +           #if ! JUCE_LINUX_EMBED

  110.              if (ui != nullptr)

  111.                  ui->repaint();

  112. +           #endif

  113.  

  114.              return LV2_STATE_SUCCESS;

  115.          }

  116. @@ -1828,8 +1839,10 @@ public:

  117.          {

  118.              filter->setCurrentProgramStateInformation (data, size);

  119.  

  120. +           #if ! JUCE_LINUX_EMBED

  121.              if (ui != nullptr)

  122.                  ui->repaint();

  123. +           #endif

  124.  

  125.              return LV2_STATE_SUCCESS;

  126.          }

  127. @@ -1852,6 +1865,7 @@ public:

  128.  #endif

  129.      }

  130.  

  131. +#if ! JUCE_LINUX_EMBED

  132.      //==============================================================================

  133.      JuceLv2UIWrapper* getUI (LV2UI_Write_Function writeFunction, LV2UI_Controller controller, LV2UI_Widget* widget,

  134.                               const LV2_Feature* const* features, bool isExternal)

  135. @@ -1865,6 +1879,7 @@ public:

  136.  

  137.          return ui;

  138.      }

  139. +#endif

  140.  

  141.  private:

  142.  #if JUCE_LINUX

  143. @@ -1874,7 +1889,9 @@ private:

  144.  #endif

  145.  

  146.      ScopedPointer<AudioProcessor> filter;

  147. +#if ! JUCE_LINUX_EMBED

  148.      ScopedPointer<JuceLv2UIWrapper> ui;

  149. +#endif

  150.      HeapBlock<float*> channels;

  151.      MidiBuffer midiEvents;

  152.      int numInChans, numOutChans;

  153. @@ -2033,6 +2050,7 @@ static const void* juceLV2_ExtensionData (const char* uri)

  154.      return nullptr;

  155.  }

  156.  

  157. +#if ! JUCE_LINUX_EMBED

  158.  //==============================================================================

  159.  // LV2 UI descriptor functions

  160.  

  161. @@ -2068,6 +2086,7 @@ static void juceLV2UI_Cleanup (LV2UI_Handle handle)

  162.  {

  163.      ((JuceLv2UIWrapper*)handle)->lv2Cleanup();

  164.  }

  165. +#endif

  166.  

  167.  //==============================================================================

  168.  // static LV2 Descriptor objects

  169. @@ -2083,6 +2102,7 @@ static const LV2_Descriptor JuceLv2Plugin = {

  170.      juceLV2_ExtensionData

  171.  };

  172.  

  173. +#if ! JUCE_LINUX_EMBED

  174.  static const LV2UI_Descriptor JuceLv2UI_External = {

  175.      strdup(String(getPluginURI() + "#ExternalUI").toRawUTF8()),

  176.      juceLV2UI_InstantiateExternal,

  177. @@ -2098,14 +2118,17 @@ static const LV2UI_Descriptor JuceLv2UI_Parent = {

  178.      nullptr,

  179.      nullptr

  180.  };

  181. +#endif

  182.  

  183.  static const struct DescriptorCleanup {

  184.      DescriptorCleanup() {}

  185.      ~DescriptorCleanup()

  186.      {

  187.          free((void*)JuceLv2Plugin.URI);

  188. +#if ! JUCE_LINUX_EMBED

  189.          free((void*)JuceLv2UI_External.URI);

  190.          free((void*)JuceLv2UI_Parent.URI);

  191. +#endif

  192.      }

  193.  } _descCleanup;

  194.  

  195. @@ -2130,6 +2153,7 @@ JUCE_EXPORTED_FUNCTION const LV2_Descriptor* lv2_descriptor (uint32 index)

  196.      return (index == 0) ? &JuceLv2Plugin : nullptr;

  197.  }

  198.  

  199. +#if ! JUCE_LINUX_EMBED

  200.  JUCE_EXPORTED_FUNCTION const LV2UI_Descriptor* lv2ui_descriptor (uint32 index);

  201.  JUCE_EXPORTED_FUNCTION const LV2UI_Descriptor* lv2ui_descriptor (uint32 index)

  202.  {

  203. @@ -2143,5 +2167,6 @@ JUCE_EXPORTED_FUNCTION const LV2UI_Descriptor* lv2ui_descriptor (uint32 index)

  204.          return nullptr;

  205.      }

  206.  }

  207. +#endif

  208.  

  209.  #endif

  210. diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp

  211. index 8df41ca..4c0a6a1 100644

  212. --- a/modules/juce_audio_processors/juce_audio_processors.cpp

  213. +++ b/modules/juce_audio_processors/juce_audio_processors.cpp

  214. @@ -47,7 +47,7 @@

  215.   #endif

  216.  #endif

  217.  

  218. -#if JUCE_PLUGINHOST_VST && JUCE_LINUX

  219. +#if JUCE_PLUGINHOST_VST && JUCE_LINUX && ! JUCE_LINUX_EMBED

  220.   #include <X11/Xlib.h>

  221.   #include <X11/Xutil.h>

  222.   #undef KeyPress

  223. @@ -161,7 +161,9 @@ void AutoResizingNSViewComponentWithParent::timerCallback()

  224.  #include "format/juce_AudioPluginFormat.cpp"

  225.  #include "format/juce_AudioPluginFormatManager.cpp"

  226.  #include "processors/juce_AudioProcessor.cpp"

  227. -#include "processors/juce_AudioProcessorEditor.cpp"

  228. +#if ! JUCE_LINUX_EMBED

  229. + #include "processors/juce_AudioProcessorEditor.cpp"

  230. +#endif

  231.  #include "processors/juce_AudioProcessorGraph.cpp"

  232.  #include "processors/juce_GenericAudioProcessorEditor.cpp"

  233.  #include "processors/juce_PluginDescription.cpp"

  234. diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp

  235. index 729a78f..6d69c40 100644

  236. --- a/modules/juce_events/juce_events.cpp

  237. +++ b/modules/juce_events/juce_events.cpp

  238. @@ -55,10 +55,12 @@

  239.   #import <IOKit/pwr_mgt/IOPMLib.h>

  240.  

  241.  #elif JUCE_LINUX

  242. - #include <X11/Xlib.h>

  243. - #include <X11/Xresource.h>

  244. - #include <X11/Xutil.h>

  245. - #undef KeyPress

  246. + #if ! JUCE_LINUX_EMBED

  247. +  #include <X11/Xlib.h>

  248. +  #include <X11/Xresource.h>

  249. +  #include <X11/Xutil.h>

  250. +  #undef KeyPress

  251. + #endif

  252.   #include <unistd.h>

  253.  #endif

  254.  

  255. @@ -91,6 +93,9 @@ namespace juce

  256.  #elif JUCE_WINDOWS

  257.   #include "native/juce_win32_Messaging.cpp"

  258.  

  259. +#elif JUCE_LINUX_EMBED

  260. + #include "native/juce_linux-embed_Messaging.cpp"

  261. +

  262.  #elif JUCE_LINUX

  263.   #include "native/juce_ScopedXLock.h"

  264.   #include "native/juce_linux_Messaging.cpp"