Use window instead of embedder application

LMMS · Apr 1, 2017 · a6400c9 · a6400c9
1 parent f533246
commit a6400c9
Show file tree

Hide file tree

Showing 10 changed files with 115 additions and 610 deletions.
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
@@ -1217,7 +1217,7 @@ RemotePluginClient::RemotePluginClient( const char * socketPath ) :
 	if( waitForMessage( IdBufferSizeInformation ).id
 						!= IdBufferSizeInformation )
 	{
-		fprintf( stderr, "Could not get buffer size information.\n" );
+		fprintf( stderr, "Could not get buffer size information\n" );
 	}
 	sendMessage( IdHostInfoGotten );
 }

diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp
@@ -219,7 +219,9 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) :
 		l->addItem( new QSpacerItem( newSize - 20, 30, QSizePolicy::Fixed, 
 						QSizePolicy::Fixed ), 1, 0 );
 		l->addWidget( resize, 2, 0, 1, 1, Qt::AlignCenter );
+#if QT_VERSION < 0x050000
 		l->addWidget( m_pluginWidget, 3, 0, 1, 1, Qt::AlignCenter );
+#endif
 		l->setRowStretch( 5, 1 );
 		l->setColumnStretch( 1, 1 );
 
@@ -273,11 +275,11 @@ void VstEffectControlDialog::togglePluginUI( bool checked )
 	{
 		if( checked )
 		{
-			m_plugin->showUI();
+			m_plugin->showEditor( NULL, true );
 		}
 		else
 		{
-			m_plugin->hideUI();
+			m_plugin->hideEditor();
 		}
 	}
 }

diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
@@ -272,7 +272,7 @@ void vestigeInstrument::loadFile( const QString & _file )
 		return;
 	}
 
-	m_plugin->showUI();
+	m_plugin->showEditor( NULL, false );
 
 	if( set_ch_name )
 	{
@@ -753,7 +753,7 @@ void VestigeInstrumentView::toggleGUI( void )
 	{
 		return;
 	}
-	m_vi->m_plugin->toggleUI();
+	m_vi->m_plugin->toggleEditor();
 }
 
 

diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
@@ -77,18 +77,6 @@ ADD_CUSTOM_COMMAND(
 	OUTPUTS ../RemoteVstPlugin
 )
 
-IF(QT5)
-	QT5_WRAP_CPP(embed-window_MOC_out EmbedderApplication.h)
-ELSE()
-	QT4_WRAP_CPP(embed-window_MOC_out EmbedderApplication.h)
-ENDIF()
-
-ADD_EXECUTABLE(embed-window embed-window.cpp ${embed-window_MOC_out})
-TARGET_LINK_LIBRARIES(embed-window ${QT_LIBRARIES})
-IF(NOT QT5)
-	TARGET_LINK_LIBRARIES(embed-window ${X11_X11_LIB})
-ENDIF()
-
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ../RemoteVstPlugin.exe.so)
 INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin.exe.so" DESTINATION "${PLUGIN_DIR}")
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)

diff --git a/plugins/vst_base/EmbedderApplication.h b/plugins/vst_base/EmbedderApplication.h