4 files changed, 17 insertions, 6 deletions
diff --git a/libs/ardour/ardour/lxvst_plugin.h b/libs/ardour/ardour/lxvst_plugin.h
index 5a35d9832e..25703956c7 100644
--- a/libs/ardour/ardour/lxvst_plugin.h
+++ b/libs/ardour/ardour/lxvst_plugin.h
@@ -40,10 +40,10 @@ class LIBARDOUR_API LXVSTPlugin : public VSTPlugin
 	std::string state_node_name () const { return "lxvst"; }
 };
 
-class LIBARDOUR_API LXVSTPluginInfo : public PluginInfo
+class LIBARDOUR_API LXVSTPluginInfo : public VSTPluginInfo
 {
   public:
-	LXVSTPluginInfo ();
+	LXVSTPluginInfo (_VSTInfo*);
 	~LXVSTPluginInfo () {}
 
 	PluginPtr load (Session& session);
diff --git a/libs/ardour/ardour/mac_vst_plugin.h b/libs/ardour/ardour/mac_vst_plugin.h
index fa05dff80f..d7ab8c2698 100644
--- a/libs/ardour/ardour/mac_vst_plugin.h
+++ b/libs/ardour/ardour/mac_vst_plugin.h
@@ -42,10 +42,10 @@ protected:
 	void open_plugin ();
 };
 
-class LIBARDOUR_API MacVSTPluginInfo : public PluginInfo
+class LIBARDOUR_API MacVSTPluginInfo : public VSTPluginInfo
 {
 public:
-	MacVSTPluginInfo ();
+	MacVSTPluginInfo (_VSTInfo*);
 	~MacVSTPluginInfo () {}
 
 	PluginPtr load (Session& session);
diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h
index b2189143d3..21ac6775ad 100644
--- a/libs/ardour/ardour/vst_plugin.h
+++ b/libs/ardour/ardour/vst_plugin.h
@@ -32,6 +32,8 @@ typedef struct _VSTState VSTState;
 
 #include "ardour/vestige/vestige.h"
 
+struct _VSTInfo;
+
 namespace ARDOUR {
 
 class PluginInsert;
@@ -134,6 +136,15 @@ protected:
 	bool       _eff_bypassed;
 };
 
+class LIBARDOUR_API VSTPluginInfo : public PluginInfo
+{
+public:
+	VSTPluginInfo (_VSTInfo*);
+	bool is_instrument () const;
+protected:
+	bool _is_instrument;
+};
+
 }
 
 #endif
diff --git a/libs/ardour/ardour/windows_vst_plugin.h b/libs/ardour/ardour/windows_vst_plugin.h
index 7566eab098..fbbe8d1491 100644
--- a/libs/ardour/ardour/windows_vst_plugin.h
+++ b/libs/ardour/ardour/windows_vst_plugin.h
@@ -40,10 +40,10 @@ public:
 	std::string state_node_name () const { return "windows-vst"; }
 };
 
-class LIBARDOUR_API WindowsVSTPluginInfo : public PluginInfo
+class LIBARDOUR_API WindowsVSTPluginInfo : public VSTPluginInfo
 {
 public:
-	WindowsVSTPluginInfo ();
+	WindowsVSTPluginInfo (_VSTInfo*);
 	~WindowsVSTPluginInfo () {}
 
 	PluginPtr load (Session& session);