New Route dialog: add fallback default selection

[ardour.git] / gtk2_ardour / vst_plugin_ui.cc

diff --git a/gtk2_ardour/vst_plugin_ui.cc b/gtk2_ardour/vst_plugin_ui.cc
index 6ed5b9af03241932bb41fcda45440c4f58bddeee..fe6661960117d5ed4a5efc5870cb6001accb4817 100644 (file)
--- a/gtk2_ardour/vst_plugin_ui.cc
+++ b/gtk2_ardour/vst_plugin_ui.cc
@@ -20,6 +20,7 @@
 #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
@@ -38,15 +39,21 @@ 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);
+       if (insert->controls().size() > 0) {
+               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);
+       box->signal_size_allocate().connect (sigc::mem_fun (*this, &VSTPluginUI::top_box_allocated));
 #ifdef GDK_WINDOWING_X11
        pack_start (_socket, true, true);
        _socket.set_border_width (0);
@@ -59,12 +66,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
@@ -92,7 +99,7 @@ VSTPluginUI::package (Gtk::Window& win)
                        _vst->state()->width + _vst->state()->hoffset,
                        _vst->state()->height + _vst->state()->voffset);
 #endif
-       
+
        return 0;
 }
 
@@ -118,6 +125,7 @@ VSTPluginUI::configure_handler (GdkEventConfigure*)
        XEvent event;
        gint x, y;
        GdkWindow* w;
+       Window xw = _vst->state()->linux_plugin_ui_window;
 
        if ((w = _socket.gobj()->plug_window) == 0) {
                return false;
@@ -146,8 +154,19 @@ VSTPluginUI::configure_handler (GdkEventConfigure*)
 
        gdk_error_trap_push ();
        XSendEvent (GDK_WINDOW_XDISPLAY (w), GDK_WINDOW_XWINDOW (w), False, StructureNotifyMask, &event);
+       /* if the plugin does adds itself to the parent,
+        * but ardour re-parents it, we have a pointer to
+        * the socket's child and need to resize the
+        * child window (e.g. JUCE, u-he)
+        */
+       if (xw) {
+               XMoveResizeWindow (GDK_WINDOW_XDISPLAY (w), xw,
+                               0, 0, _vst->state()->width, _vst->state()->height);
+               XMapRaised (GDK_WINDOW_XDISPLAY (w), xw);
+               XFlush (GDK_WINDOW_XDISPLAY (w));
+       }
        gdk_error_trap_pop ();
-
 #endif
+
        return false;
 }