One fix.

[ardour.git] / gtk2_ardour / windows_vst_plugin_ui.cc

diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc
index 1ce83f8992bd3b10d159493d44d7636bbf83fce4..7f1481998606455daab0eec2d6e2a525a01240d5 100644 (file)
--- a/gtk2_ardour/windows_vst_plugin_ui.cc
+++ b/gtk2_ardour/windows_vst_plugin_ui.cc
@@ -17,10 +17,10 @@
 
 */
 
-#include <fst.h>
 #include <gtkmm.h>
 #include <gtk/gtk.h>
 #include <gtk/gtksocket.h>
+#include <fst.h>
 #include "ardour/plugin_insert.h"
 #include "ardour/windows_vst_plugin.h"
 
@@ -38,22 +38,18 @@ using namespace Gtk;
 using namespace ARDOUR;
 using namespace PBD;
 
-WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp)
+WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boost::shared_ptr<VSTPlugin> vp, GtkWidget *parent)
        : VSTPluginUI (pi, vp)
 {
 
 #ifdef GDK_WINDOWING_WIN32
-
-#if 0 // TODO verify window vs vbox-widget WRT to plugin_analysis_expander
-       GtkWindow* wobj = GTK_WINDOW(gtk_widget_get_toplevel(this->gobj()));
-#else
-       GtkVBox* wobj = this->gobj();
-#endif
-
-       gtk_widget_realize(GTK_WIDGET(wobj));
-       void* hWndHost = gdk_win32_drawable_get_handle(GTK_WIDGET(wobj)->window);
+       gtk_widget_realize(parent);
+       void* hWndHost = gdk_win32_drawable_get_handle(parent->window);
 
        fst_run_editor (_vst->state(), hWndHost);
+       // TODO pack a placeholder (compare to VSTPluginUI::VSTPluginUI X11 socket)
+       // have placeholder use VSTPluginUI::get_preferred_height(), width()
+       // TODO pack plugin_analysis_expander at the bottom.
 #else
        fst_run_editor (_vst->state(), NULL);
        pack_start (plugin_analysis_expander, true, true);
@@ -62,6 +58,8 @@ WindowsVSTPluginUI::WindowsVSTPluginUI (boost::shared_ptr<PluginInsert> pi, boos
 
 WindowsVSTPluginUI::~WindowsVSTPluginUI ()
 {
+       fst_destroy_editor (_vst->state());
+
        // plugin destructor destroys the custom GUI, via Windows fun-and-games,
        // and then our PluginUIWindow does the rest
 }
@@ -90,10 +88,10 @@ WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev)
                /* buffer full */
                return;
        }
-       
+
        int special_windows_key = 0;
        int character_windows_key = 0;
-       
+
        switch (ev->keyval) {
        case GDK_Left:
                special_windows_key = 0x25;
@@ -115,11 +113,11 @@ WindowsVSTPluginUI::forward_key_event (GdkEventKey* ev)
                character_windows_key = ev->keyval;
                break;
        }
-       
+
        fst->pending_keys[fst->n_pending_keys].special = special_windows_key;
        fst->pending_keys[fst->n_pending_keys].character = character_windows_key;
        fst->n_pending_keys++;
-       
+
        pthread_mutex_unlock (&fst->lock);
 }