Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
a81f4ca
Embed VST GUI in subwindow
Jun 17, 2016
878dd94
Embed in a separate window
Oct 2, 2016
ebe63d1
Fixes for Windows builds
Jan 2, 2017
6395cd4
Enable C++11
Jan 3, 2017
e3d3052
Enable C++11 on Windows
Jan 4, 2017
12f6ea5
C++11 is enabled by default now
Jan 24, 2017
f87f363
Use window instead of embedder application
Mar 31, 2017
2d35de4
Debug window ID
Apr 1, 2017
d04fd9f
FluidSynth is currently undistributable
Apr 10, 2017
7a9396d
Let Wine handle the window interface
Apr 10, 2017
47d0e66
Re-enable SF2
tresf Apr 10, 2017
e661d26
Add X11EmbedContainer Qt5 port
lukas-w Apr 1, 2017
adef05f
X11EmbedContainer: Fix XEMBED protocol implementation
lukas-w Apr 8, 2017
f097be6
RemoteVst: Fix flickering when moving window
lukas-w Apr 8, 2017
0e311ff
X11Embed: Remove flag causing embedding to fail
lukas-w Apr 8, 2017
8fdcc6c
Fix compile on Windows
lukas-w Apr 8, 2017
7ce60c2
Travis: Add missing packages
lukas-w Apr 8, 2017
dc4a387
X11EmbedContainer: Don't grab mouse in acceptClient, more debugging msgs
lukas-w Jul 15, 2017
000fe2d
Travis: Fix xcb package name
lukas-w Jul 16, 2017
d9626e9
Move X11EmbedContainer.h to include
lukas-w Jul 19, 2017
def2b7d
Move X11EmbedContainer to submodule
lukas-w Aug 5, 2017
0d3aaf6
.gitmodules: Use https URL
lukas-w Aug 5, 2017
bd33475
Fix x11embed for non qt5+linux
lukas-w Aug 5, 2017
f7dab93
Merge branch 'qt5-vst-2-stable' into fix/qt5-vst
lukas-w Sep 1, 2017
ddab534
Allow switching VST embed method at compile time
lukas-w Sep 1, 2017
e7d0675
Fix Qt4 VST embed option
lukas-w Sep 1, 2017
df37833
Merge branch 'stable-1.2' into fix/qt5-vst
lukas-w Sep 22, 2017
ffa1b63
Fix VST effects embedding
lukas-w Sep 22, 2017
6839746
VstEmbed: Allow selecting method at runtime
lukas-w Nov 6, 2017
415316f
VstEmbed: Remove obsolete CMake flags
lukas-w Nov 6, 2017
134dae8
VstEmbed: Add missing find_package instruction for Qt5X11Extras
lukas-w Nov 6, 2017
472a74d
Minor fixes
lukas-w Nov 6, 2017
e95fdcc
Add missing includes
lukas-w Nov 6, 2017
421a85d
Update qt5-x11embed submodule
lukas-w Nov 6, 2017
e3ba9ba
Update qt5-x11embed submodule for CMake changes
lukas-w Nov 6, 2017
6eb447d
Merge branch 'stable-1.2' into fix/qt5-vst
lukas-w Nov 7, 2017
2b6f366
CMake: Only link qx11embedcontainer on Linux
lukas-w Nov 7, 2017
6fd38fe
Fix qt5-x11embed submodule reference
lukas-w Nov 7, 2017
a8311a7
Vst: Fix widget deletion
lukas-w Nov 10, 2017
f9f4d0c
VstEmbed: Store embed method on plugin start
lukas-w Nov 10, 2017
358a251
VstEmbed: Support changing embed method without restart
lukas-w Nov 10, 2017
df3c07b
Fix Qt4 compatibility
PhysSong Nov 6, 2017
b0f64de
Restrict "qt" embed method to Qt5 only
PhysSong Nov 6, 2017
7da7a70
Add Win32 embedding
PhysSong Nov 7, 2017
463d02e
Move SC_CLOSE handling code
PhysSong Nov 8, 2017
55ce90e
Try to improve embedding method logic
PhysSong Nov 18, 2017
72e882a
Add a fallback logic for VST embedding methods
PhysSong Nov 20, 2017
a8aa3e1
VST: Fix Qt4 compilation
lukas-w Nov 24, 2017
3d47344
Travis: Enable Linux/Qt4 builds
lukas-w Nov 24, 2017
e95e379
Merge pull request #3991 from PhysSong/fix/qt5-vst
lukas-w Nov 24, 2017
23cb385
VstEmbed: Remove obsolete CMake flags
lukas-w Nov 24, 2017
7019cab
Merge branch 'stable-1.2' into fix/qt5-vst
lukas-w Nov 25, 2017
238d6b6
CMake: Fix RemoteVstPlugin build when winebuild is not in PATH
lukas-w Nov 25, 2017
8c02495
Qt4 compat simplified
lukas-w Nov 25, 2017
ae488b8
Fix VstEffect width issue
lukas-w Nov 29, 2017
a446775
VST: Fix Qt-embedded VSTs not always appearing
lukas-w Nov 29, 2017
7ae348e
Vst refactorings
lukas-w Nov 29, 2017
19f4889
VST: Disable plugin reload on embed method change
lukas-w Dec 18, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add missing includes
  • Loading branch information
lukas-w committed Nov 6, 2017
commit e95fdcc37d9dda014b0607cfe3dfbec18b098c52
22 changes: 13 additions & 9 deletions plugins/vst_base/VstPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,25 @@
#include <QCloseEvent>
#include <QMdiArea>
#include <QMdiSubWindow>

#ifdef LMMS_BUILD_LINUX
#if QT_VERSION < 0x050000
#include <QX11EmbedContainer>
#include <QX11Info>
#else
#include "X11EmbedContainer.h"
#include <QWindow>
# if QT_VERSION < 0x050000
# include <QX11EmbedContainer>
# include <QX11Info>
# else
# include "X11EmbedContainer.h"
# include <QWindow>
# endif
#endif
#else
#include <QLayout>

#if QT_VERSION >= 0x050000
# include <QWindow>
#endif

#include <QDomDocument>

#ifdef LMMS_BUILD_WIN32
#include <windows.h>
# include <windows.h>
#endif

#include "ConfigManager.h"
Expand Down