Browse Source

Fix X11 display usage in LV2 wrapper

pull/8/head
falkTX 7 years ago
parent
commit
72137e3ae4
1 changed files with 9 additions and 9 deletions
  1. +9
    -9
      modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp

+ 9
- 9
modules/juce_audio_plugin_client/LV2/juce_LV2_Wrapper.cpp View File

@@ -79,13 +79,6 @@


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


#if JUCE_LINUX && ! JUCE_AUDIOPROCESSOR_NO_GUI
namespace juce
{
extern Display* display;
}
#endif

#define JUCE_LV2_STATE_STRING_URI "urn:juce:stateString" #define JUCE_LV2_STATE_STRING_URI "urn:juce:stateString"
#define JUCE_LV2_STATE_BINARY_URI "urn:juce:stateBinary" #define JUCE_LV2_STATE_BINARY_URI "urn:juce:stateBinary"


@@ -765,7 +758,7 @@ public:
const int ch = child->getHeight(); const int ch = child->getHeight();


#if JUCE_LINUX #if JUCE_LINUX
XResizeWindow (display, (Window) getWindowHandle(), cw, ch);
XResizeWindow (display.display, (Window) getWindowHandle(), cw, ch);
#else #else
setSize (cw, ch); setSize (cw, ch);
#endif #endif
@@ -785,6 +778,9 @@ public:
private: private:
//============================================================================== //==============================================================================
const LV2UI_Resize* uiResize; const LV2UI_Resize* uiResize;
#if JUCE_LINUX
ScopedXDisplay display;
#endif


JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceLv2ParentContainer); JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceLv2ParentContainer);
}; };
@@ -1041,6 +1037,10 @@ private:
ScopedPointer<JuceLv2ParentContainer> parentContainer; ScopedPointer<JuceLv2ParentContainer> parentContainer;
const LV2UI_Resize* uiResize; const LV2UI_Resize* uiResize;


#if JUCE_LINUX
ScopedXDisplay display;
#endif

//============================================================================== //==============================================================================
void resetExternalUI (const LV2_Feature* const* features) void resetExternalUI (const LV2_Feature* const* features)
{ {
@@ -1099,7 +1099,7 @@ private:
#if JUCE_LINUX #if JUCE_LINUX
Window hostWindow = (Window) parent; Window hostWindow = (Window) parent;
Window editorWnd = (Window) parentContainer->getWindowHandle(); Window editorWnd = (Window) parentContainer->getWindowHandle();
XReparentWindow (display, editorWnd, hostWindow, 0, 0);
XReparentWindow (display.display, editorWnd, hostWindow, 0, 0);
#endif #endif


parentContainer->reset (uiResize); parentContainer->reset (uiResize);


Loading…
Cancel
Save