5 files changed, 31 insertions, 29 deletions

diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h
index 3c5ae5e18a..a7a5703690 100644
--- a/libs/ardour/ardour/plugin_manager.h
+++ b/libs/ardour/ardour/plugin_manager.h
@@ -43,7 +43,7 @@ class PluginManager : public boost::noncopyable {
 
 	~PluginManager ();
 
-	ARDOUR::PluginInfoList &vst_plugin_info ();
+	ARDOUR::PluginInfoList &windows_vst_plugin_info ();
 	ARDOUR::PluginInfoList &lxvst_plugin_info ();
 	ARDOUR::PluginInfoList &ladspa_plugin_info ();
 	ARDOUR::PluginInfoList &lv2_plugin_info ();
@@ -52,7 +52,7 @@ class PluginManager : public boost::noncopyable {
 	void refresh ();
 
 	int add_ladspa_directory (std::string dirpath);
-	int add_vst_directory (std::string dirpath);
+	int add_windows_vst_directory (std::string dirpath);
 	int add_lxvst_directory (std::string dirpath);
 
 	enum PluginStatusType {
@@ -95,7 +95,7 @@ class PluginManager : public boost::noncopyable {
 	PluginStatusList statuses;
 
 	ARDOUR::PluginInfoList  _empty_plugin_info;
-	ARDOUR::PluginInfoList* _vst_plugin_info;
+	ARDOUR::PluginInfoList* _windows_vst_plugin_info;
 	ARDOUR::PluginInfoList*	_lxvst_plugin_info;
 	ARDOUR::PluginInfoList* _ladspa_plugin_info;
 	ARDOUR::PluginInfoList* _lv2_plugin_info;
@@ -104,16 +104,16 @@ class PluginManager : public boost::noncopyable {
 	std::map<uint32_t, std::string> rdf_type;
 
 	std::string ladspa_path;
-	std::string vst_path;
+	std::string windows_vst_path;
 	std::string lxvst_path;
 
 	void ladspa_refresh ();
-	void vst_refresh ();
+	void windows_vst_refresh ();
 	void lxvst_refresh ();
 
 	void add_lrdf_data (const std::string &path);
 	void add_ladspa_presets ();
-	void add_vst_presets ();
+	void add_windows_vst_presets ();
 	void add_lxvst_presets ();
 	void add_presets (std::string domain);
 
@@ -121,8 +121,8 @@ class PluginManager : public boost::noncopyable {
 
 	void lv2_refresh ();
 
-	int vst_discover_from_path (std::string path);
-	int vst_discover (std::string path);
+	int windows_vst_discover_from_path (std::string path);
+	int windows_vst_discover (std::string path);
 	
 	int lxvst_discover_from_path (std::string path);
 	int lxvst_discover (std::string path);
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 35f5ce9838..621e96d78a 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -140,7 +140,7 @@ CONFIG_VARIABLE (bool, replicate_missing_region_channels, "replicate-missing-reg
 CONFIG_VARIABLE (bool, hiding_groups_deactivates_groups, "hiding-groups-deactivates-groups", true)
 CONFIG_VARIABLE (bool, verify_remove_last_capture, "verify-remove-last-capture", true)
 CONFIG_VARIABLE (bool, no_new_session_dialog, "no-new-session-dialog", false)
-CONFIG_VARIABLE (bool, use_vst, "use-vst", true)
+CONFIG_VARIABLE (bool, use_windows_vst, "use-windows-vst", true)
 CONFIG_VARIABLE (bool, use_lxvst, "use-lxvst", true)
 CONFIG_VARIABLE (bool, save_history, "save-history", true)
 CONFIG_VARIABLE (int32_t, saved_history_depth, "save-history-depth", 20)
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index fd607cd6f6..252c824ce7 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -127,7 +127,7 @@ class Source;
 class Speakers;
 class TempoMap;
 class Track;
-class VSTPlugin;
+class WindowsVSTPlugin;
 
 extern void setup_enum_writer ();
 
@@ -1420,14 +1420,16 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::shared_ptr<Route> _master_out;
 	boost::shared_ptr<Route> _monitor_out;
 
-	/* VST support */
+	/* Windows VST support */
 
-	long _vst_callback (VSTPlugin*,
-			long opcode,
-			long index,
-			long value,
-			void* ptr,
-			float opt);
+	long _windows_vst_callback (
+		WindowsVSTPlugin*,
+		long opcode,
+		long index,
+		long value,
+		void* ptr,
+		float opt
+		);
 
 	/* number of hardware ports we're using,
 	   based on max (requested,available)
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 417a9ed54d..d518962288 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -462,7 +462,7 @@ namespace ARDOUR {
 		AudioUnit,
 		LADSPA,
 		LV2,
-		VST,
+		Windows_VST,
 		LXVST,
 	};
 
diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/windows_vst_plugin.h
index d1522059d1..5e6d906184 100644
--- a/libs/ardour/ardour/vst_plugin.h
+++ b/libs/ardour/ardour/windows_vst_plugin.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef __ardour_vst_plugin_h__
-#define __ardour_vst_plugin_h__
+#ifndef __ardour_windows_vst_plugin_h__
+#define __ardour_windows_vst_plugin_h__
 
 #include <list>
 #include <map>
@@ -40,12 +40,12 @@ namespace ARDOUR {
 class AudioEngine;
 class Session;
 
-class VSTPlugin : public ARDOUR::Plugin
+class WindowsVSTPlugin : public ARDOUR::Plugin
 {
   public:
-	VSTPlugin (ARDOUR::AudioEngine&, ARDOUR::Session&, FSTHandle* handle);
-	VSTPlugin (const VSTPlugin &);
-	~VSTPlugin ();
+	WindowsVSTPlugin (ARDOUR::AudioEngine&, ARDOUR::Session&, FSTHandle* handle);
+	WindowsVSTPlugin (const WindowsVSTPlugin &);
+	~WindowsVSTPlugin ();
 
 	/* Plugin interface */
 
@@ -70,7 +70,7 @@ class VSTPlugin : public ARDOUR::Plugin
 			pframes_t nframes, framecnt_t offset);
 
 	std::string describe_parameter (Evoral::Parameter);
-	std::string state_node_name() const { return "vst"; }
+	std::string state_node_name() const { return "windows-vst"; }
 	void print_parameter (uint32_t, char*, uint32_t len) const;
 
 	bool parameter_is_audio(uint32_t i) const { return false; }
@@ -107,16 +107,16 @@ private:
 	bool        been_resumed;
 };
 
-class VSTPluginInfo : public PluginInfo
+class WindowsVSTPluginInfo : public PluginInfo
 {
   public:
-	VSTPluginInfo ();
-	~VSTPluginInfo () {}
+	WindowsVSTPluginInfo ();
+	~WindowsVSTPluginInfo () {}
 
 	PluginPtr load (Session& session);
 };
 
-typedef boost::shared_ptr<VSTPluginInfo> VSTPluginInfoPtr;
+typedef boost::shared_ptr<WindowsVSTPluginInfo> WindowsVSTPluginInfoPtr;
 
 } // namespace ARDOUR