List VSTs as instruments

include/Plugin.h

@@ -88,7 +88,7 @@ class LMMS_EXPORT Plugin : public Model, public JournallingObject
 	//! Descriptor holds information about a plugin - every external plugin
 	//! has to instantiate such a Descriptor in an extern "C"-section so that
 	//! the plugin-loader is able to access information about the plugin
-	struct Descriptor
+	struct LMMS_EXPORT Descriptor
 	{
 		const char * name;
 		const char * displayName;
@@ -132,7 +132,7 @@ class LMMS_EXPORT Plugin : public Model, public JournallingObject
 					SubPluginFeatures, which are like values
 					in a key-value map).
 			*/
-			struct Key
+			struct LMMS_EXPORT Key
 			{
 				using AttributeMap = QMap<QString, QString>;
 

include/SetupDialog.h

@@ -98,6 +98,7 @@ private slots:
 	void toggleAnimateAFP(bool enabled);
 	void vstEmbedMethodChanged();
 	void toggleVSTAlwaysOnTop(bool en);
+	void toggleVstScanExec(bool enabled) { m_vstScanExec = enabled; };
 	void toggleDisableAutoQuit(bool enabled);
 	void toggleMixSanitization(bool enabled);
 
@@ -173,6 +174,7 @@ private slots:
 	QString m_vstEmbedMethod;
 	QCheckBox * m_vstAlwaysOnTopCheckBox;
 	bool m_vstAlwaysOnTop;
+	bool m_vstScanExec;
 	bool m_disableAutoQuit;
 
 	using AswMap = QMap<QString, AudioDeviceSetupWidget*>;

plugins/Vestige/Vestige.cpp

@@ -54,6 +54,8 @@
 #include "SubWindow.h"
 #include "TextFloat.h"
 #include "VstPlugin.h"
+#include "VstSubPluginFeatures.h"
+#include "VstList.h"
 
 namespace lmms
 {
@@ -81,7 +83,9 @@ Plugin::Descriptor Q_DECL_EXPORT  vestige_plugin_descriptor =
 		"so",
 #	endif
 #endif
-	nullptr,
+	(!ConfigManager::inst()->value("app", "vstscanexec", "0").toInt() || VstList::inst()->plugins().empty())
+		? nullptr // makes Vestige appear as a plugin by itself
+		: new VstSubPluginFeatures(Plugin::Type::Instrument),
 } ;
 
 }
@@ -149,8 +153,8 @@ class VstInstrumentPlugin : public VstPlugin
 
 
 
-VestigeInstrument::VestigeInstrument( InstrumentTrack * _instrument_track ) :
-	Instrument(_instrument_track, &vestige_plugin_descriptor, nullptr, Flag::IsSingleStreamed | Flag::IsMidiBased),
+VestigeInstrument::VestigeInstrument(InstrumentTrack* instrumentTrack, Plugin::Descriptor::SubPluginFeatures::Key* key) :
+	Instrument(instrumentTrack, &vestige_plugin_descriptor, nullptr, Flag::IsSingleStreamed | Flag::IsMidiBased),
 	m_plugin( nullptr ),
 	m_pluginMutex(),
 	m_subWindow( nullptr ),
@@ -159,12 +163,17 @@ VestigeInstrument::VestigeInstrument( InstrumentTrack * _instrument_track ) :
 	p_subWindow( nullptr )
 {
 	// now we need a play-handle which cares for calling play()
-	auto iph = new InstrumentPlayHandle(this, _instrument_track);
+	auto iph = new InstrumentPlayHandle(this, instrumentTrack);
 	Engine::audioEngine()->addPlayHandle( iph );
 
 	connect( ConfigManager::inst(), SIGNAL( valueChanged(QString,QString,QString) ),
 			 this, SLOT( handleConfigChange(QString, QString, QString) ),
 			 Qt::QueuedConnection );
+	if (auto& path = key->attributes["file"]; !path.isEmpty())
+	{
+		loadFile(path);
+		setDisplayName(key->displayName());
+	}
 }
 
 
@@ -1182,9 +1191,12 @@ extern "C"
 {
 
 // necessary for getting instance out of shared lib
-Q_DECL_EXPORT Plugin * lmms_plugin_main( Model *m, void * )
+Q_DECL_EXPORT Plugin * lmms_plugin_main(Model* m, void* data)
 {
-	return new VestigeInstrument( static_cast<InstrumentTrack *>( m ) );
+	return new VestigeInstrument{
+		static_cast<InstrumentTrack*>(m),
+		static_cast<Plugin::Descriptor::SubPluginFeatures::Key*>(data)
+	};
 }
 
 

plugins/Vestige/Vestige.h

@@ -58,7 +58,7 @@ class VestigeInstrument : public Instrument
 {
 	Q_OBJECT
 public:
-	VestigeInstrument( InstrumentTrack * _instrument_track );
+	VestigeInstrument(InstrumentTrack* instrumentTrack, Plugin::Descriptor::SubPluginFeatures::Key* data);
 	virtual ~VestigeInstrument();
 
 	virtual void play( SampleFrame* _working_buffer );

plugins/VstBase/RemoteVstPlugin.cpp

@@ -171,9 +171,9 @@ class RemoteVstPlugin : public RemotePluginClient
 {
 public:
 #ifdef SYNC_WITH_SHM_FIFO
-	RemoteVstPlugin( const std::string& _shm_in, const std::string& _shm_out );
+	RemoteVstPlugin(const std::string& _shm_in, const std::string& _shm_out, bool skipInit = false);
 #else
-	RemoteVstPlugin( const char * socketPath );
+	RemoteVstPlugin(const char* socketPath, bool skipInit = false);
 #endif
 	virtual ~RemoteVstPlugin();
 
@@ -491,16 +491,17 @@ class RemoteVstPlugin : public RemotePluginClient
 	};
 
 	Sync m_sync;
+	bool m_skipInit;
 };
 
 
 
 
 #ifdef SYNC_WITH_SHM_FIFO
-RemoteVstPlugin::RemoteVstPlugin( const std::string& _shm_in, const std::string& _shm_out ) :
+RemoteVstPlugin::RemoteVstPlugin(const std::string& _shm_in, const std::string& _shm_out, bool skipInit) :
 	RemotePluginClient( _shm_in, _shm_out ),
 #else
-RemoteVstPlugin::RemoteVstPlugin( const char * socketPath ) :
+RemoteVstPlugin::RemoteVstPlugin(const char * socketPath, bool skipInit) :
 	RemotePluginClient( socketPath ),
 #endif
 	m_libInst( nullptr ),
@@ -519,7 +520,8 @@ RemoteVstPlugin::RemoteVstPlugin( const char * socketPath ) :
 	m_midiEvents(),
 	m_bpm( 0 ),
 	m_currentSamplePos( 0 ),
-	m_currentProgram(-1)
+	m_currentProgram(-1),
+	m_skipInit{skipInit}
 {
 	__plugin = this;
 
@@ -749,26 +751,25 @@ void RemoteVstPlugin::init( const std::string & _plugin_file )
 
 	setResumed( true );
 
-	debugMessage( "creating editor\n" );
-	initEditor();
-	debugMessage( "editor successfully created\n" );
+	if (!m_skipInit) {
+		debugMessage( "creating editor\n" );
+		initEditor();
+		debugMessage( "editor successfully created\n" );
+	}
 
 
 	// now post some information about our plugin
-	sendMessage( message( IdVstPluginWindowID ).addInt( m_windowID ) );
-
-	sendMessage( message( IdVstPluginEditorGeometry ).
-						addInt( m_windowWidth ).
-						addInt( m_windowHeight ) );
-	sendMessage( message( IdVstPluginName ).addString( pluginName() ) );
-	debugMessage( std::string("plugin name: ") + pluginName() + "\n" );
-	sendMessage( message( IdVstPluginVersion ).addInt( pluginVersion() ) );
-	sendMessage( message( IdVstPluginVendorString ).
-					addString( pluginVendorString() ) );
-	sendMessage( message( IdVstPluginProductString ).
-					addString( pluginProductString() ) );
-	sendMessage( message( IdVstParameterCount ).
-					addInt( m_plugin->numParams ) );
+	sendMessage(message(IdVstPluginWindowID).addInt(m_windowID));
+
+	sendMessage(message(IdVstPluginEditorGeometry).addInt(m_windowWidth).addInt(m_windowHeight));
+	sendMessage(message(IdVstPluginName).addString(pluginName()));
+	debugMessage(std::string("plugin name: ") + pluginName() + "\n");
+	sendMessage(message(IdVstPluginVersion).addInt(pluginVersion()));
+	sendMessage(message(IdVstPluginVendorString).addString(pluginVendorString()));
+	sendMessage(message(IdVstPluginProductString).addString(pluginProductString()));
+	sendMessage(message(IdVstParameterCount).addInt(m_plugin->numParams));
+
+	if (m_plugin->flags & effFlagsIsSynth) { sendMessage(message(IdVstIsSynth)); }
 
 	sendMessage( IdInitDone );
 
@@ -1034,7 +1035,7 @@ bool RemoteVstPlugin::load( const std::string & _plugin_file )
 
 	sendMessage( message( IdVstPluginUniqueID ).addString( id ) );
 
-	pluginDispatch( effOpen );
+	if (!m_skipInit){ pluginDispatch(effOpen); }
 
 	return true;
 }
@@ -2480,9 +2481,9 @@ int main( int _argc, char * * _argv )
 	using lmms::RemoteVstPlugin;
 
 #ifdef SYNC_WITH_SHM_FIFO
-	if( _argc < 4 )
+	if( _argc < 5 )
 #else
-	if( _argc < 3 )
+	if( _argc < 4 )
 #endif
 	{
 		fprintf( stderr, "not enough arguments\n" );
@@ -2540,13 +2541,15 @@ int main( int _argc, char * * _argv )
 	}
 
 #endif
+	bool skipInit;
 	{
 	#ifdef SYNC_WITH_SHM_FIFO
 		int embedMethodIndex = 3;
 	#else
 		int embedMethodIndex = 2;
 	#endif
 		std::string embedMethod = _argv[embedMethodIndex];
+		skipInit = _argv[embedMethodIndex+1][0] != '0';
 
 		if ( embedMethod == "none" )
 		{
@@ -2590,9 +2593,9 @@ int main( int _argc, char * * _argv )
 	// constructor automatically will process messages until it receives
 	// a IdVstLoadPlugin message and processes it
 #ifdef SYNC_WITH_SHM_FIFO
-	__plugin = new RemoteVstPlugin( _argv[1], _argv[2] );
+	__plugin = new RemoteVstPlugin{_argv[1], _argv[2], skipInit};
 #else
-	__plugin = new RemoteVstPlugin( _argv[1] );
+	__plugin = new RemoteVstPlugin{_argv[1], skipInit};
 #endif
 
 	if( __plugin->isInitialized() )