Rename windows VST stuff with a Windows prefix.

git-svn-id: svn://localhost/ardour2/branches/3.0@10738 d708f5d6-7413-0410-9779-e7cbd77b26cf

8 files changed, 52 insertions, 52 deletions

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index fc07758eea..6af714a02f 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -452,9 +452,9 @@ sigpipe_handler (int /*signal*/)
 void close_external_ui_windows();
 #endif
 
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 
-extern int gui_init (int* argc, char** argv[]);
+extern int windows_vst_gui_init (int* argc, char** argv[]);
 
 /* this is called from the entry point of a wine-compiled
    executable that is linked against gtk2_ardour built
@@ -474,11 +474,11 @@ int main (int argc, char *argv[])
 
 	gtk_set_locale ();
 
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 	/* this does some magic that is needed to make GTK and Wine's own
 	   X11 client interact properly.
 	*/
-	gui_init (&argc, &argv);
+	windows_vst_gui_init (&argc, &argv);
 #endif
 
 	(void) bindtextdomain (PACKAGE, localedir);
@@ -564,7 +564,7 @@ int main (int argc, char *argv[])
 #endif
 	return 0;
 }
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 } // end of extern C block
 #endif
 
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index a0bf287d7a..6b4c5e9369 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -66,7 +66,7 @@ print_help (const char *execname)
 	     << _("  -N, --new session-name      Create a new session from the command line\n")
 	     << _("  -O, --no-hw-optimizations   Disable h/w specific optimizations\n")
 	     << _("  -S, --sync                  Draw the gui synchronously \n")
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 	     << _("  -V, --novst                 Do not use VST support\n")
 #endif
 	     << _("  -E, --save <file>           Load the specified session, save it to <file> and then quit\n")
@@ -184,9 +184,9 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			break;
 
 		case 'V':
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 			use_vst = false;
-#endif /* VST_SUPPORT */
+#endif /* WINDOWS_VST_SUPPORT */
 			break;
 
 		case 'c':
diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 71036b72da..f834e5e7d5 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -238,7 +238,7 @@ PluginSelector::show_this_plugin (const PluginInfoPtr& info, const std::string&
 			case LV2:
 				compstr = X_("LV2");
 				break;
-			case VST:
+			case Windows_VST:
 				compstr = X_("VST");
 				break;
 			case LXVST:
@@ -351,14 +351,14 @@ PluginSelector::lv2_refiller (const std::string& filterstr)
 }
 
 void
-#ifdef VST_SUPPORT
+#ifdef WINDOWS_VST_SUPPORT
 PluginSelector::vst_refiller (const std::string& filterstr)
 #else
 PluginSelector::vst_refiller (const std::string&)
 #endif
 {
-#ifdef VST_SUPPORT
-	refiller (manager.vst_plugin_info(), filterstr, "VST");
+#ifdef WINDOWS_VST_SUPPORT
+	refiller (manager.windows_vst_plugin_info(), filterstr, "VST");
 #endif
 }
 
@@ -599,8 +599,8 @@ PluginSelector::build_plugin_menu ()
 	PluginInfoList all_plugs;
 
 	all_plugs.insert (all_plugs.end(), manager.ladspa_plugin_info().begin(), manager.ladspa_plugin_info().end());
-#ifdef VST_SUPPORT
-	all_plugs.insert (all_plugs.end(), manager.vst_plugin_info().begin(), manager.vst_plugin_info().end());
+#ifdef WINDOWS_VST_SUPPORT
+	all_plugs.insert (all_plugs.end(), manager.windows_vst_plugin_info().begin(), manager.windows_vst_plugin_info().end());
 #endif
 #ifdef LXVST_SUPPORT
 	all_plugs.insert (all_plugs.end(), manager.lxvst_plugin_info().begin(), manager.lxvst_plugin_info().end());
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index f7410bba3c..66f418b6fe 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -46,9 +46,9 @@
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/ladspa_plugin.h"
-#ifdef VST_SUPPORT
-#include "ardour/vst_plugin.h"
-#include "vst_pluginui.h"
+#ifdef WINDOWS_VST_SUPPORT
+#include "ardour/windows_vst_plugin.h"
+#include "windows_vst_plugin_ui.h"
 #endif
 #ifdef LXVST_SUPPORT
 #include "ardour/lxvst_plugin.h"
@@ -99,8 +99,8 @@ PluginUIWindow::PluginUIWindow (
 	          << " editor: " << editor << std::endl;
 	if (editor && insert->plugin()->has_editor()) {
 		switch (insert->type()) {
-		case ARDOUR::VST:
-			have_gui = create_vst_editor (insert);
+		case ARDOUR::Windows_VST:
+			have_gui = create_windows_vst_editor (insert);
 			break;
 			
 		case ARDOUR::LXVST:
@@ -120,7 +120,7 @@ PluginUIWindow::PluginUIWindow (
 			break;
 
 		default:
-#ifndef VST_SUPPORT
+#ifndef WINDOWS_VST_SUPPORT
 			error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)")
 			      << endmsg;
 #else
@@ -253,24 +253,24 @@ PluginUIWindow::set_title(const std::string& title)
 }
 
 bool
-#ifdef VST_SUPPORT
-PluginUIWindow::create_vst_editor(boost::shared_ptr<PluginInsert> insert)
+#ifdef WINDOWS_VST_SUPPORT
+PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert> insert)
 #else
-PluginUIWindow::create_vst_editor(boost::shared_ptr<PluginInsert>)
+PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert>)
 #endif
 {
-#ifndef VST_SUPPORT
+#ifndef WINDOWS_VST_SUPPORT
 	return false;
 #else
 
-	boost::shared_ptr<VSTPlugin> vp;
+	boost::shared_ptr<WindowsVSTPlugin> vp;
 
-	if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (insert->plugin())) == 0) {
+	if ((vp = boost::dynamic_pointer_cast<WindowsVSTPlugin> (insert->plugin())) == 0) {
 		error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)")
 			      << endmsg;
 		throw failed_constructor ();
 	} else {
-		VSTPluginUI* vpu = new VSTPluginUI (insert, vp);
+		WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp);
 
 		_pluginui = vpu;
 		_pluginui->KeyboardFocused.connect (sigc::mem_fun (*this, &PluginUIWindow::keyboard_focused));
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 66b025527a..95be14ceee 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -53,7 +53,7 @@
 namespace ARDOUR {
 	class PluginInsert;
 	class Plugin;
-	class VSTPlugin;
+	class WindowsVSTPlugin;
 	class LXVSTPlugin;
 	class IOProcessor;
 	class AUPlugin;
@@ -297,7 +297,7 @@ class PluginUIWindow : public Gtk::Window
 	void app_activated (bool);
 	void plugin_going_away ();
 
-	bool create_vst_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
+	bool create_windows_vst_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
 	bool create_lxvst_editor(boost::shared_ptr<ARDOUR::PluginInsert>);
 	bool create_audiounit_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
 	bool create_lv2_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc
index 8548c535d7..e76458051b 100644
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/windows_vst_plugin_ui.cc
@@ -21,9 +21,9 @@
 #include <gtk/gtk.h>
 #include <gtk/gtksocket.h>
 #include "ardour/plugin_insert.h"
-#include "ardour/vst_plugin.h"
+#include "ardour/windows_vst_plugin.h"
 
-#include "vst_pluginui.h"
+#include "windows_vst_plugin_ui.h"
 
 #include <gdk/gdkx.h>
 
@@ -31,7 +31,7 @@ using namespace Gtk;
 using namespace ARDOUR;
 using namespace PBD;
 
-VSTPluginUI::VSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp)
+WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<WindowsVSTPlugin> vp)
 	: PlugUIBase (pi),
 	  vst (vp)
 {
@@ -53,37 +53,37 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<
 	pack_start (plugin_analysis_expander, true, true);
 }
 
-VSTPluginUI::~VSTPluginUI ()
+WindowsVSTPluginUI::~WindowsVSTPluginUI ()
 {
 	// plugin destructor destroys the custom GUI, via Windows fun-and-games,
 	// and then our PluginUIWindow does the rest
 }
 
 void
-VSTPluginUI::preset_selected ()
+WindowsVSTPluginUI::preset_selected ()
 {
 	socket.grab_focus ();
 	PlugUIBase::preset_selected ();
 }
 
 int
-VSTPluginUI::get_preferred_height ()
+WindowsVSTPluginUI::get_preferred_height ()
 {
 	return vst->fst()->height;
 }
 
 int
-VSTPluginUI::get_preferred_width ()
+WindowsVSTPluginUI::get_preferred_width ()
 {
 	return vst->fst()->width;
 }
 
 int
-VSTPluginUI::package (Gtk::Window& win)
+WindowsVSTPluginUI::package (Gtk::Window& win)
 {
 	/* forward configure events to plugin window */
 
-	win.signal_configure_event().connect (sigc::bind (sigc::mem_fun (*this, &VSTPluginUI::configure_handler), &socket), false);
+	win.signal_configure_event().connect (sigc::bind (sigc::mem_fun (*this, &WindowsVSTPluginUI::configure_handler), &socket), false);
 
 	/*
 	   this assumes that the window's owner understands the XEmbed protocol.
@@ -97,7 +97,7 @@ VSTPluginUI::package (Gtk::Window& win)
 }
 
 bool
-VSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket)
+WindowsVSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket)
 {
 	XEvent event;
 	gint x, y;
@@ -136,7 +136,7 @@ VSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket)
 }
 
 void
-VSTPluginUI::forward_key_event (GdkEventKey* ev)
+WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev)
 {
 	if (ev->type == GDK_KEY_PRESS) {
 
@@ -199,7 +199,7 @@ fst_xerror_handler( Display *disp, XErrorEvent *ev )
 }
 
 void
-gui_init (int *argc, char **argv[])
+windows_vst_gui_init (int *argc, char **argv[])
 {
 	wine_error_handler = XSetErrorHandler (NULL);
 	gtk_init (argc, argv);
diff --git a/gtk2_ardour/vst_pluginui.h b/gtk2_ardour/windows_vst_plugin_ui.h
index cb7743439f..93b531f9dd 100644
--- a/gtk2_ardour/vst_pluginui.h
+++ b/gtk2_ardour/windows_vst_plugin_ui.h
@@ -19,11 +19,11 @@
 
 #include "plugin_ui.h"
 
-class VSTPluginUI : public PlugUIBase, public Gtk::VBox
+class WindowsVSTPluginUI : public PlugUIBase, public Gtk::VBox
 {
   public:
-	VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>);
-	~VSTPluginUI ();
+	WindowsVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::WindowsVSTPlugin>);
+	~WindowsVSTPluginUI ();
 
 	gint get_preferred_height ();
 	gint get_preferred_width ();
@@ -36,7 +36,7 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
 	bool non_gtk_gui () const { return true; }
 
   private:
-	boost::shared_ptr<ARDOUR::VSTPlugin> vst;
+	boost::shared_ptr<ARDOUR::WindowsVSTPlugin> vst;
 	Gtk::Socket socket;
 	Gtk::HBox   preset_box;
 	Gtk::VBox   vpacker;
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 50d617290a..d9a9860ba5 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -345,7 +345,7 @@ def build_color_scheme(path, prefix):
 def build(bld):
     # GTK front-end; if we're using VST we build this as a shared library,
     # otherwise it's a normal executabale
-    if bld.is_defined('VST_SUPPORT'):
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
         obj = bld(features = 'cxx c cxxshlib')
     else:
         obj = bld(features = 'cxx c cxxprogram')
@@ -354,7 +354,7 @@ def build(bld):
     obj.source       = gtk2_ardour_sources
     obj.name         = 'gtk2_ardour'
     obj.linkflags    = []
-    if bld.is_defined('VST_SUPPORT'):
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
         obj.target = 'gtk2_ardour'
         obj.includes += ['../libs/fst']
     else:
@@ -392,9 +392,9 @@ def build(bld):
         obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
         obj.defines += [ 'FREESOUND' ]
 
-    if bld.is_defined('VST_SUPPORT'):
-        obj.source += [ 'vst_pluginui.cc' ]
-        obj.defines += [ 'VST_SUPPORT' ]
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
+        obj.source += [ 'windows_vst_plugin_ui.cc' ]
+        obj.defines += [ 'WINDOWS_VST_SUPPORT' ]
         obj.uselib += ' X11 '
 
     if bld.is_defined('LXVST_SUPPORT'):
@@ -410,7 +410,7 @@ def build(bld):
         obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ]
         obj.use += ' libappleutility '
 
-    if bld.is_defined('VST_SUPPORT'):
+    if bld.is_defined('WINDOWS_VST_SUPPORT'):
         # If we require VST support we build a stub main() and the FST library
         # here using winegcc, and link it to the GTK front-end library
         obj = bld(features = 'cxx c cxxprogram wine')
@@ -423,7 +423,7 @@ def build(bld):
         '''
         obj.includes = '../libs/fst'
         obj.target = 'ardour-3.0-vst'
-        obj.linkflags += ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
+        obj.linkflags = ['-mwindows', '-Wl,--export-dynamic', '-lpthread']
         obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
         obj.uselib = 'ALSA'
         obj.use = ['libpbd','libmidipp','libtaglib','libardour',