Merge remote-tracking branch 'remotes/origin/master' into windows+cc

[ardour.git] / gtk2_ardour / send_ui.cc

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 3cc17faaea5c2e64087a7fbb9c562472109b6fe8..e37dd659f6edd57b96abbda687bcb7fff01c25af 100644 (file)
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -19,7 +19,6 @@
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.h"
 #include "ardour/io.h"
 #include "ardour/send.h"
 #include "ardour/rc_configuration.h"
@@ -41,7 +40,9 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
        , _gpm (session, 250)
        , _panners (session)
 {
-       _panners.set_panner (s->panner());
+       assert (_send);
+
+       _panners.set_panner (s->panner_shell(), s->panner());
        _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp());
 
        _hbox.pack_start (_gpm, true, true);
@@ -51,20 +52,26 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
        _vbox.set_border_width (5);
 
        _vbox.pack_start (_hbox, false, false, false);
-       _vbox.pack_start (_panners, false, false);
+       // until sends have their own Pannable, don't show this
+       // because it controls the Route Pannable which confuses
+       // users (among others)
+       // _vbox.pack_start (_panners, false, false);
 
-       io = manage (new IOSelector (parent, session, s->output()));
+       io = Gtk::manage (new IOSelector (parent, session, s->output()));
 
        pack_start (_vbox, false, false);
 
        pack_start (*io, true, true);
 
-       show_all ();
+       io->show ();
+       _gpm.show_all ();
+       _panners.show_all ();
+       _vbox.show ();
+       _hbox.show ();
 
        _send->set_metering (true);
 
-       _send->input()->changed.connect (connections, invalidator (*this), ui_bind (&SendUI::ins_changed, this, _1, _2), gui_context());
-       _send->output()->changed.connect (connections, invalidator (*this), ui_bind (&SendUI::outs_changed, this, _1, _2), gui_context());
+       _send->output()->changed.connect (connections, invalidator (*this), boost::bind (&SendUI::outs_changed, this, _1, _2), gui_context());
 
        _panners.set_width (Wide);
        _panners.setup_pan ();
@@ -89,19 +96,10 @@ SendUI::~SendUI ()
 }
 
 void
-SendUI::ins_changed (IOChange change, void* ignored)
-{
-       ENSURE_GUI_THREAD (*this, &SendUI::ins_changed, change, ignored)
-       if (change & ConfigurationChanged) {
-               _panners.setup_pan ();
-       }
-}
-
-void
-SendUI::outs_changed (IOChange change, void* ignored)
+SendUI::outs_changed (IOChange change, void* /*ignored*/)
 {
        ENSURE_GUI_THREAD (*this, &SendUI::outs_changed, change, ignored)
-       if (change & ConfigurationChanged) {
+       if (change.type & IOChange::ConfigurationChanged) {
                _panners.setup_pan ();
                _gpm.setup_meters ();
        }
@@ -115,28 +113,30 @@ SendUI::update ()
 void
 SendUI::fast_update ()
 {
+       if (!is_mapped()) {
+               return;
+       }
+
        if (Config->get_meter_falloff() > 0.0f) {
                _gpm.update_meters ();
        }
 }
 
 SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
-       : ArdourDialog (string (_("Send ")) + s->name())
+       : ArdourWindow (string (_("Send ")) + s->name())
 {
        ui = new SendUI (this, s, session);
 
        hpacker.pack_start (*ui, true, true);
 
-       get_vbox()->set_border_width (5);
-       get_vbox()->pack_start (hpacker);
+       add (hpacker);
 
        set_name ("SendUIWindow");
 
-       s->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&SendUIWindow::send_going_away, this), gui_context());
+       ui->show ();
+       hpacker.show ();
 
-       signal_delete_event().connect (sigc::bind (
-                                              sigc::ptr_fun (just_hide_it),
-                                              reinterpret_cast<Window *> (this)));
+       s->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&SendUIWindow::send_going_away, this), gui_context());
 }
 
 SendUIWindow::~SendUIWindow ()