Fix up VST build and add basic support for VSTi

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

3 files changed, 54 insertions, 5 deletions

diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 7b5e77ec18..bfd23fab6b 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -298,9 +298,24 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
 	Gtk::Socket socket;
 	Gtk::HBox   preset_box;
 	Gtk::VBox   vpacker;
+	Gtk::ComboBoxText vst_preset_combo;
+	Glib::RefPtr<Gtk::ListStore> preset_model;
+
+	struct PresetModelColumns : public Gtk::TreeModel::ColumnRecord {
+	    PresetModelColumns() { 
+		    add (name);
+		    add (number);
+	    }
+	    Gtk::TreeModelColumn<Glib::ustring> name;
+	    Gtk::TreeModelColumn<int> number;
+	};
+
+	PresetModelColumns preset_columns;
 
 	bool configure_handler (GdkEventConfigure*, Gtk::Socket*);
 	void save_plugin_setting ();
+	void create_preset_store ();
+	void preset_chosen ();
 };
 #endif // VST_SUPPORT
 
diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc
index bd678dd72d..6c1b359fd4 100644
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/vst_pluginui.cc
@@ -20,7 +20,7 @@
 #include <fst.h>
 #include <gtk/gtk.h>
 #include <gtk/gtksocket.h>
-#include "ardour/insert.h"
+#include "ardour/plugin_insert.h"
 #include "ardour/vst_plugin.h"
 
 #include "plugin_ui.h"
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index ddae851127..940d43d5b4 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -237,13 +237,29 @@ def configure(conf):
 	autowaf.check_header(conf, 'boost/shared_ptr.hpp')
 	autowaf.check_header(conf, 'boost/weak_ptr.hpp')
 
+# Add a waf `feature' to allow compilation of things using winegcc
+from TaskGen import feature
+@feature("wine")
+def set_winegcc(self):
+	self.env.LINK_CXX = self.env.LINK_CC = 'wineg++'
+	self.env.CC = 'winegcc'
+
 def build(bld):
-	# Program
-	obj = bld.new_task_gen(features = 'cxx cc cprogram')
+	# GTK front-end; if we're using VST we build this as a shared library, otherwise
+	# it's a normal executabale
+	if bld.env['VST_SUPPORT']:
+		obj = bld.new_task_gen(features = 'cxx cc cshlib')
+	else:
+		obj = bld.new_task_gen(features = 'cxx cc cprogram')
+
 	obj.includes     = ['.']
 	obj.source       = gtk2_ardour_sources
 	obj.name         = 'gtk2_ardour'
-	obj.target       = 'ardour-3.0'
+	if bld.env['VST_SUPPORT']:
+		obj.target = 'gtk2_ardour'
+		obj.includes += ['../libs/fst']
+	else:
+		obj.target = 'ardour-3.0'
 	obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 	obj.uselib       = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA'
 	obj.uselib       += ' GTKMM GNOMECANVASMM OSX GTKOSX COREAUDIO'
@@ -266,7 +282,7 @@ def build(bld):
 	if bld.env['FREESOUND']:
 		obj.source +=  [ 'sfdb_freesound_mootcher.cc' ]
 
-	if bld.env['VST']:
+	if bld.env['VST_SUPPORT']:
 		obj.source += [ 'vst_pluginui.cc' ]
 		obj.cxxflags += [ '-DVST_SUPPORT' ]
 
@@ -281,6 +297,24 @@ def build(bld):
 	else:
 		obj.source += [ 'x11.cc' ]
 
+	if bld.env['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.new_task_gen (features = 'cxx cc cprogram wine')
+		obj.source = '''
+			../libs/fst/fst.c
+			../libs/fst/fstinfofile.c
+			../libs/fst/vsti.c
+			../libs/fst/vstwin.c
+			../vst/winmain.c
+		'''
+		obj.includes = '../libs/fst'
+		obj.target = 'ardour-3.0-vst'
+		obj.linkflags = ['-mwindows', '-Wl,--export-dynamic']
+		obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX']
+		obj.uselib = 'ALSA'
+		obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib gtk2_ardour'''
+
 	# Wrappers
 
 	wrapper_subst_dict = {