3 notable patches from lincoln (a) non-layered track mode (NOTE: this is broken for...

[ardour.git] / gtk2_ardour / send_ui.cc

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 90ff3de717637378aa6e3260020c05a7158aa2e1..1014f5a07a9e977da1d060606016d3b91773eff4 100644 (file)
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -17,9 +17,11 @@
 
 */
 
-#include <ardour/send.h>
 #include <gtkmm2ext/doi.h>
 
+#include "ardour/io.h"
+#include "ardour/send.h"
+
 #include "utils.h"
 #include "send_ui.h"
 #include "io_selector.h"
@@ -30,11 +32,14 @@ using namespace ARDOUR;
 using namespace PBD;
 
 SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
-       : _send (s),
-         _session (se),
-         gpm (s->io(), se),
-         panners (s->io(), se)
+       : _send (s)
+       , _session (se)
+       , gpm (se)
+       , panners (se)
 {
+       panners.set_io (s->io());
+       gpm.set_io (s->io());
+
        hbox.pack_start (gpm, true, true);
        set_name ("SendUIFrame");
        
@@ -44,7 +49,7 @@ SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
        vbox.pack_start (hbox, false, false, false);
        vbox.pack_start (panners, false,false);
 
-       io = manage (new IOSelector (se, s->io(), false));
+       io = manage (new IOSelector (se, s->io(), true));
        
        pack_start (vbox, false, false);
 
@@ -110,22 +115,20 @@ SendUI::fast_update ()
 }
        
 SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
+       : ArdourDialog (string("Ardour: send ") + s->name())
 {
        ui = new SendUI (s, ss);
 
-       vpacker.set_border_width (5);
-
        hpacker.pack_start (*ui, true, true);
 
-       vpacker.pack_start (hpacker);
+       get_vbox()->set_border_width (5);
+       get_vbox()->pack_start (hpacker);
 
-       add (vpacker);
        set_name ("SendUIWindow");
        
        going_away_connection = s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
 
        signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
-
 }
 
 SendUIWindow::~SendUIWindow ()