Skip to content

Get rid of embedding completely #7837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Rossmaxx wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Get rid of embedding completely #7837

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6fef20
nuked the x11embed submodule
Rossmaxx Apr 7, 2025
aa989ad
begone embedding
Rossmaxx Apr 7, 2025
da2af7c
fix builds
Rossmaxx Apr 7, 2025
07c940b
tidied up everything and a few fixes here and there
Rossmaxx Apr 7, 2025
671467f
more fixing builds
Rossmaxx Apr 7, 2025
4279daf
fix ci
Rossmaxx Apr 7, 2025
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
fix builds
  • Loading branch information
@Rossmaxx
Rossmaxx committed Apr 7, 2025
commit da2af7c9f6fee6eff421093e62dbac8b21673084
3 changes: 3 additions & 0 deletions include/ConfigManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@ class LMMS_EXPORT ConfigManager : public QObject

static bool enableBlockedPlugins();

static QStringList availableVstEmbedMethods();
QString vstEmbedMethod() const;

// Returns true if the working dir (e.g. ~/lmms) exists on disk.
bool hasWorkingDir() const;

Expand Down
15 changes: 6 additions & 9 deletions plugins/VstBase/RemoteVstPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@
return true;

case IdIsUIVisible:
{
#ifndef NATIVE_LINUX_VST
bool visible = m_window && IsWindowVisible( m_window );
#else
Expand All @@ -594,7 +595,11 @@
sendMessage( message( IdIsUIVisible )
.addInt( visible ? 1 : 0 ) );
return true;
}
}

switch( _m.id )
{
case IdVstLoadPlugin:
init( _m.getString() );
break;
Expand Down Expand Up @@ -782,7 +787,7 @@
}


dwStyle = WS_OVERLAPPEDWINDOW & ~WS_MAXIMIZEBOX;
DWORD dwStyle = WS_OVERLAPPEDWINDOW & ~WS_MAXIMIZEBOX;

m_window = CreateWindowEx( WS_EX_APPWINDOW, "LVSL", pluginName(),
dwStyle,
Expand Down Expand Up @@ -860,20 +865,12 @@


void RemoteVstPlugin::showEditor() {
if (!HEADLESS && m_window)
{
ShowWindow( m_window, SW_SHOWNORMAL );
}
}




void RemoteVstPlugin::hideEditor() {
if (!HEADLESS && m_window)
{
ShowWindow( m_window, SW_HIDE );
}
}


Expand Down Expand Up @@ -2165,7 +2162,7 @@
RemotePluginClient::message m;
while( ( m = _this->receiveMessage() ).id != IdQuit )
{

Check notice on line 2165 in plugins/VstBase/RemoteVstPlugin.cpp

View check run for this annotation

codefactor.io / CodeFactor

plugins/VstBase/RemoteVstPlugin.cpp#L2165 

Redundant blank line at the start of a code block should be deleted. (whitespace/blank_line)
if( m.id == IdStartProcessing
|| m.id == IdMidiEvent
|| m.id == IdVstSetParameter
Expand Down
11 changes: 5 additions & 6 deletions plugins/VstBase/VstPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@

#include <QWindow>

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


#include "AudioEngine.h"
#include "ConfigManager.h"
Expand Down Expand Up @@ -382,12 +387,6 @@ bool VstPlugin::processMessage( const message & _m )
GWLP_HWNDPARENT,
(LONG_PTR) gui::getGUI()->mainWindow()->winId() );
#endif

#ifdef LMMS_BUILD_LINUX
XSetTransientForHint( QX11Info::display(),
m_pluginWindowID,
gui::getGUI()->mainWindow()->winId() );
#endif
}
break;

Expand Down
Loading