X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvst_plugin_ui.cc;h=a964e96b4ee920ecb08f233c6e8cb8f779ade326;hb=c0641354360ee55238852fdd01704e237c6a5b16;hp=35f59a71f5d6fee7ab0e2cb355f629e082ed16cc;hpb=8843679e1fbf3d8b2989da65a61e26270c5f42c4;p=ardour.git

diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc
index 35f59a71f5..a964e96b4e 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,7 +39,8 @@ 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);
@@ -41,6 +51,7 @@ VSTPluginUI::VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> insert, boost:
 	pack_start (*box, false, false);
 #ifdef GDK_WINDOWING_X11
 	pack_start (_socket, true, true);
+	_socket.set_border_width (0);
 #endif
 }
 
@@ -50,12 +61,12 @@ VSTPluginUI::~VSTPluginUI ()
 }
 
 void
-VSTPluginUI::preset_selected ()
+VSTPluginUI::preset_selected (ARDOUR::Plugin::PresetRecord preset)
 {
 #ifdef GDK_WINDOWING_X11
 	_socket.grab_focus ();
 #endif
-	PlugUIBase::preset_selected ();
+	PlugUIBase::preset_selected (preset);
 }
 
 int
@@ -79,8 +90,11 @@ VSTPluginUI::package (Gtk::Window& win)
 
 	/* 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;
 }
 
@@ -139,4 +153,3 @@ VSTPluginUI::configure_handler (GdkEventConfigure*)
 #endif
 	return false;
 }
-