X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvst_plugin_ui.cc;h=532fcf672201b17edf859f2dfd2fcb9011d889fc;hb=c7863289664f0c847f6a5e1c0fa5b4c731c134d3;hp=303fb8b8dd956358c9d236cc1a9c8ee966a6449a;hpb=b08d13706f9e98fc75a727822209942c00d8f1b3;p=ardour.git

diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc
index 303fb8b8dd..532fcf6722 100644
--- a/gtk2_ardour/vst_plugin_ui.cc
+++ b/gtk2_ardour/vst_plugin_ui.cc
@@ -17,10 +17,19 @@
 
 */
 
+#include <gtkmm.h>
 #include "ardour/vst_plugin.h"
 #include "ardour/vst_types.h"
+#include "ardour/plugin_insert.h"
 #include "vst_plugin_ui.h"
+
+#ifdef PLATFORM_WINDOWS
+#include <gdk/gdkwin32.h>
+#elif defined __APPLE__
+// TODO
+#else
 #include <gdk/gdkx.h>
+#endif
 
 VSTPluginUI::VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> insert, boost::shared_ptr<ARDOUR::VSTPlugin> plugin)
 	: PlugUIBase (insert)
@@ -30,16 +39,22 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> insert, boost:
 	box->set_spacing (6);
 	box->set_border_width (6);
 	box->pack_end (focus_button, false, false);
-	box->pack_end (bypass_button, false, false, 10);
+	box->pack_end (bypass_button, false, false, 4);
+	box->pack_end (reset_button, false, false, 4);
 	box->pack_end (delete_button, false, false);
 	box->pack_end (save_button, false, false);
 	box->pack_end (add_button, false, false);
 	box->pack_end (_preset_combo, false, false);
+	box->pack_end (_preset_modified, false, false);
+	box->pack_end (pin_management_button, false, false);
 
 	bypass_button.set_active (!insert->active ());
 
 	pack_start (*box, false, false);
+#ifdef GDK_WINDOWING_X11
 	pack_start (_socket, true, true);
+	_socket.set_border_width (0);
+#endif
 }
 
 VSTPluginUI::~VSTPluginUI ()
@@ -48,39 +63,62 @@ VSTPluginUI::~VSTPluginUI ()
 }
 
 void
-VSTPluginUI::preset_selected ()
+VSTPluginUI::preset_selected (ARDOUR::Plugin::PresetRecord preset)
 {
+#ifdef GDK_WINDOWING_X11
 	_socket.grab_focus ();
-	PlugUIBase::preset_selected ();
+#endif
+	PlugUIBase::preset_selected (preset);
 }
 
 int
 VSTPluginUI::get_preferred_height ()
 {
-	return _vst->state()->height;
+	return _vst->state()->height + _vst->state()->voffset;
 }
 
 int
 VSTPluginUI::get_preferred_width ()
 {
-	return _vst->state()->width;
+	return _vst->state()->width + _vst->state()->hoffset;
 }
 
 int
 VSTPluginUI::package (Gtk::Window& win)
 {
+#ifdef GDK_WINDOWING_X11
 	/* Forward configure events to plugin window */
 	win.signal_configure_event().connect (sigc::mem_fun (*this, &VSTPluginUI::configure_handler), false);
 
 	/* This assumes that the window's owner understands the XEmbed protocol */
 	_socket.add_id (get_XID ());
-	
+	_socket.set_size_request(
+			_vst->state()->width + _vst->state()->hoffset,
+			_vst->state()->height + _vst->state()->voffset);
+#endif
+
 	return 0;
 }
 
 bool
-VSTPluginUI::configure_handler (GdkEventConfigure* ev)
+VSTPluginUI::on_window_show(const std::string& title)
+{
+	_vst->state()->gui_shown = 1;
+	return PlugUIBase::on_window_show(title);
+}
+
+void
+VSTPluginUI::on_window_hide()
+{
+	_vst->state()->gui_shown = 0;
+	PlugUIBase::on_window_hide();
+}
+
+
+bool
+VSTPluginUI::configure_handler (GdkEventConfigure*)
 {
+#ifdef GDK_WINDOWING_X11
 	XEvent event;
 	gint x, y;
 	GdkWindow* w;
@@ -114,6 +152,6 @@ VSTPluginUI::configure_handler (GdkEventConfigure* ev)
 	XSendEvent (GDK_WINDOW_XDISPLAY (w), GDK_WINDOW_XWINDOW (w), False, StructureNotifyMask, &event);
 	gdk_error_trap_pop ();
 
+#endif
 	return false;
 }
-