Fix Mixbus action fc83d044f8 & 65bda27d4 rebase ordering

[ardour.git] / gtk2_ardour / send_ui.cc

diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index b10bd96ea92bd7b5c638f4be45c970055cd17921..364e44c7b0113b43495830a4a6150a1bff84bd2e 100644 (file)
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -20,16 +20,16 @@
 #include <gtkmm2ext/doi.h>
 
 #include "ardour/io.h"
+#include "ardour/panner_manager.h"
 #include "ardour/send.h"
 #include "ardour/rc_configuration.h"
 
-#include "utils.h"
 #include "send_ui.h"
 #include "io_selector.h"
-#include "ardour_ui.h"
+#include "timers.h"
 #include "gui_thread.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -43,7 +43,7 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
        assert (_send);
 
        _panners.set_panner (s->panner_shell(), s->panner());
-       _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp());
+       _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp(), s->gain_control());
 
        _hbox.pack_start (_gpm, true, true);
        set_name (X_("SendUIFrame"));
@@ -52,10 +52,7 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
        _vbox.set_border_width (5);
 
        _vbox.pack_start (_hbox, false, 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);
+       _vbox.pack_start (_panners, false, false);
 
        io = Gtk::manage (new IOSelector (parent, session, s->output()));
 
@@ -73,15 +70,19 @@ SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
 
        _send->output()->changed.connect (connections, invalidator (*this), boost::bind (&SendUI::outs_changed, this, _1, _2), gui_context());
 
+       uint32_t const in = _send->pans_required();
+       uint32_t const out = _send->pan_outs();
+
        _panners.set_width (Wide);
+       _panners.set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out));
        _panners.setup_pan ();
 
        _gpm.setup_meters ();
        _gpm.set_fader_name (X_("SendUIFader"));
 
-       // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (
+       // screen_update_connection = Timers::rapid_connect (
        //              sigc::mem_fun (*this, &SendUI::update));
-       fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
+       fast_screen_update_connection = Timers::super_rapid_connect (
                        sigc::mem_fun (*this, &SendUI::fast_update));
 }
 
@@ -100,7 +101,14 @@ SendUI::outs_changed (IOChange change, void* /*ignored*/)
 {
        ENSURE_GUI_THREAD (*this, &SendUI::outs_changed, change, ignored)
        if (change.type & IOChange::ConfigurationChanged) {
+               uint32_t const in = _send->pans_required();
+               uint32_t const out = _send->pan_outs();
+               if (_panners._panner == 0) {
+                       _panners.set_panner (_send->panner_shell(), _send->panner());
+               }
+               _panners.set_available_panners(PannerManager::instance().PannerManager::get_available_panners(in, out));
                _panners.setup_pan ();
+               _panners.show_all ();
                _gpm.setup_meters ();
        }
 }
@@ -136,19 +144,9 @@ SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
        ui->show ();
        hpacker.show ();
 
-       s->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&SendUIWindow::send_going_away, this), gui_context());
 }
 
 SendUIWindow::~SendUIWindow ()
 {
        delete ui;
 }
-
-void
-SendUIWindow::send_going_away ()
-{
-       ENSURE_GUI_THREAD (*this, &SendUIWindow::send_going_away)
-       going_away_connection.disconnect ();
-       delete_when_idle (this);
-}
-