X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvst_pluginui.cc;h=aba100a97ce26ba69d4d108f93696701634b523d;hb=9c89a93e4f96826bec6ed519f8f435e4fc73bfa5;hp=fae211f424219748efa6086cbe40efec75000cf4;hpb=912da52a539981193941d8739fa6f103b5e406db;p=ardour.git

diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc
index fae211f424..aba100a97c 100644
--- a/gtk2_ardour/vst_pluginui.cc
+++ b/gtk2_ardour/vst_pluginui.cc
@@ -15,12 +15,11 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <fst.h>
-
-#include <ardour/insert.h>
+#include <gtk/gtksocket.h>
+#include <ardour/processor.h>
 #include <ardour/vst_plugin.h>
 
 #include "plugin_ui.h"
@@ -31,17 +30,17 @@ using namespace Gtk;
 using namespace ARDOUR;
 using namespace PBD;
 
-VSTPluginUI::VSTPluginUI (PluginInsert& pi, VSTPlugin& vp)
+VSTPluginUI::VSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp)
 	: PlugUIBase (pi),
 	  vst (vp)
 {
-	fst_run_editor (vst.fst());
+	fst_run_editor (vst->fst());
 
 	preset_box.pack_end (bypass_button, false, false, 10);
 	preset_box.pack_end (save_button, false, false);
-	preset_box.pack_end (combo, false, false);
+	preset_box.pack_end (preset_combo, false, false);
 
-	bypass_button.set_active (!insert.active());
+	bypass_button.set_active (!insert->active());
 	
 	pack_start (preset_box, false, false);
 	pack_start (socket, true, true);
@@ -55,68 +54,67 @@ VSTPluginUI::~VSTPluginUI ()
 int
 VSTPluginUI::get_preferred_height ()
 {
-	return vst.fst()->height;
+	return vst->fst()->height;
 }
 
 int
-VSTPluginUI::package (Gtk::Window& win)
+VSTPluginUI::get_preferred_width ()
 {
-	/* for GTK+2, remove this: you cannot add to a realized socket */
-
-	//socket.realize ();
+	return vst->fst()->width;
+}
 
+int
+VSTPluginUI::package (Gtk::Window& win)
+{
 	/* forward configure events to plugin window */
 
-	win.signal_configure_event().connect (bind (mem_fun (*this, &VSTPluginUI::configure_handler), &socket));
+	win.signal_configure_event().connect (bind (mem_fun (*this, &VSTPluginUI::configure_handler), &socket), false);
 
-	/* XXX in GTK2, use add_id() instead of steal, although add_id()
-	   assumes that the window's owner understands the XEmbed protocol.
+	/*
+	   this assumes that the window's owner understands the XEmbed protocol.
 	*/
 	
-	socket.add_id (fst_get_XID (vst.fst()));
+	socket.add_id (fst_get_XID (vst->fst()));
 
 	return 0;
 }
 
-gboolean
+bool
 VSTPluginUI::configure_handler (GdkEventConfigure* ev, Gtk::Socket *socket)
 {
 	XEvent event;
-
 	gint x, y;
+	GdkWindow* w;
 
-	if (socket->gobj() == NULL) {
-		return FALSE;
+	if (socket == 0 || ((w = socket->gobj()->plug_window) == 0)) {
+		return false;
 	}
 
 	event.xconfigure.type = ConfigureNotify;
-	event.xconfigure.event = GDK_WINDOW_XWINDOW (socket->get_window()->gobj());
-	event.xconfigure.window = GDK_WINDOW_XWINDOW (socket->get_window()->gobj());
+	event.xconfigure.event = GDK_WINDOW_XWINDOW (w);
+	event.xconfigure.window = GDK_WINDOW_XWINDOW (w);
 
 	/* The ICCCM says that synthetic events should have root relative
 	 * coordinates. We still aren't really ICCCM compliant, since
 	 * we don't send events when the real toplevel is moved.
 	 */
 	gdk_error_trap_push ();
-	gdk_window_get_origin (socket->get_window()->gobj(), &x, &y);
+	gdk_window_get_origin (w, &x, &y);
 	gdk_error_trap_pop ();
 
 	event.xconfigure.x = x;
 	event.xconfigure.y = y;
-	event.xconfigure.width = GTK_WIDGET(socket)->allocation.width;
-	event.xconfigure.height = GTK_WIDGET(socket)->allocation.height;
+	event.xconfigure.width = GTK_WIDGET(socket->gobj())->allocation.width;
+	event.xconfigure.height = GTK_WIDGET(socket->gobj())->allocation.height;
 
 	event.xconfigure.border_width = 0;
 	event.xconfigure.above = None;
 	event.xconfigure.override_redirect = False;
 
 	gdk_error_trap_push ();
-	XSendEvent (GDK_WINDOW_XDISPLAY (socket->get_window()->gobj()),
-		    GDK_WINDOW_XWINDOW (socket->get_window()->gobj()),
-		    False, StructureNotifyMask, &event);
-	// gdk_display_sync (GDK_WINDOW_XDISPLAY (socket->plug_window));
+	XSendEvent (GDK_WINDOW_XDISPLAY (w), GDK_WINDOW_XWINDOW (w), False, StructureNotifyMask, &event);
 	gdk_error_trap_pop ();
 
-	return FALSE;
+	return false;
 }