Merge some linux/windows VST GUI code.

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

1 files changed, 12 insertions, 43 deletions

diff --git a/gtk2_ardour/lxvst_plugin_ui.h b/gtk2_ardour/lxvst_plugin_ui.h
index fc46ede8a3..5ddc68e33e 100755
--- a/gtk2_ardour/lxvst_plugin_ui.h
+++ b/gtk2_ardour/lxvst_plugin_ui.h
@@ -1,16 +1,8 @@
 #ifndef __lxvst_plugin_ui_h__
 #define __lxvst_plugin_ui_h__
 
-#include <vector>
-#include <map>
-#include <list>
-
 #include <sigc++/signal.h>
-#include <gtkmm/widget.h>
-
-#include <ardour_dialog.h>
-#include <ardour/types.h>
-#include "plugin_ui.h"
+#include "vst_plugin_ui.h"
 
 #ifdef LXVST_SUPPORT
 
@@ -19,49 +11,26 @@ namespace ARDOUR {
 	class LXVSTPlugin;
 }
 
-class LXVSTPluginUI : public PlugUIBase, public Gtk::VBox
+class LXVSTPluginUI : public VSTPluginUI
 {
   public:
-	LXVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::LXVSTPlugin>);
+	LXVSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>);
 	~LXVSTPluginUI ();
 
-	gint get_preferred_height ();
-	gint get_preferred_width ();
-	bool start_updating(GdkEventAny*);
-	bool stop_updating(GdkEventAny*);
+	int get_preferred_height ();
+	
+	bool start_updating (GdkEventAny *);
+	bool stop_updating (GdkEventAny *);
 
 	int package (Gtk::Window&);
 	void forward_key_event (GdkEventKey *);
-	bool non_gtk_gui() const { return true; }
+	bool non_gtk_gui () const { return true; }
 
-  private:
-	boost::shared_ptr<ARDOUR::LXVSTPlugin>  lxvst;
-	Gtk::Socket socket;
-	Gtk::HBox   preset_box;
-	Gtk::VBox   vpacker;
-	
-	sigc::connection _screen_update_connection;
-	
-	bool configure_handler (GdkEventConfigure*, Gtk::Socket*);
-	void save_plugin_setting ();
-
-	struct PresetModelColumns : public Gtk::TreeModel::ColumnRecord {
-	    PresetModelColumns() { 
-		    add (name);
-		    add (number);
-	    }
-	    Gtk::TreeModelColumn<Glib::ustring> name;
-	    Gtk::TreeModelColumn<int> number;
-	};
+private:
+	void resize_callback ();
+	int get_XID ();
 
-	PresetModelColumns preset_columns;
-	Glib::RefPtr<Gtk::ListStore> preset_model;
-	Gtk::ComboBox lxvst_preset_combo;
-
-	void create_preset_store ();
-	void preset_chosen ();
-	void preset_selected ();
-	void resize_callback();
+	sigc::connection _screen_update_connection;
 };
 
 #endif //LXVST_SUPPORT