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 7dda653894ee1868fb1ddaafcab635d942d1a7c9..364e44c7b0113b43495830a4a6150a1bff84bd2e 100644 (file)
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,60 +17,79 @@
 
 */
 
-#include <ardour/send.h>
 #include <gtkmm2ext/doi.h>
 
-#include "utils.h"
+#include "ardour/io.h"
+#include "ardour/panner_manager.h"
+#include "ardour/send.h"
+#include "ardour/rc_configuration.h"
+
 #include "send_ui.h"
 #include "io_selector.h"
-#include "ardour_ui.h"
+#include "timers.h"
 #include "gui_thread.h"
 
+#include "pbd/i18n.h"
+
+using namespace std;
 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)
+SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session)
+       : _send (s)
+       , _gpm (session, 250)
+       , _panners (session)
 {
-       hbox.pack_start (gpm, true, true);
-       set_name ("SendUIFrame");
-       
-       vbox.set_spacing (5);
-       vbox.set_border_width (5);
+       assert (_send);
+
+       _panners.set_panner (s->panner_shell(), s->panner());
+       _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp(), s->gain_control());
+
+       _hbox.pack_start (_gpm, true, true);
+       set_name (X_("SendUIFrame"));
+
+       _vbox.set_spacing (5);
+       _vbox.set_border_width (5);
+
+       _vbox.pack_start (_hbox, false, false, false);
+       _vbox.pack_start (_panners, false, false);
 
-       vbox.pack_start (hbox, false, false, false);
-       vbox.pack_start (panners, false,false);
+       io = Gtk::manage (new IOSelector (parent, session, s->output()));
 
-       io = new IOSelector (se, s->io(), false);
-       
-       pack_start (vbox, false, false);
+       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->io()->output_changed.connect (mem_fun (*this, &SendUI::ins_changed));
-       _send->io()->output_changed.connect (mem_fun (*this, &SendUI::outs_changed));
-       
-       panners.set_width (Wide);
-       panners.setup_pan ();
+       _send->output()->changed.connect (connections, invalidator (*this), boost::bind (&SendUI::outs_changed, this, _1, _2), gui_context());
 
-       gpm.setup_meters ();
-       gpm.set_fader_name ("SendUIFrame");
+       uint32_t const in = _send->pans_required();
+       uint32_t const out = _send->pan_outs();
 
-       // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &SendUI::update));
-       fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &SendUI::fast_update));
+       _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 = Timers::rapid_connect (
+       //              sigc::mem_fun (*this, &SendUI::update));
+       fast_screen_update_connection = Timers::super_rapid_connect (
+                       sigc::mem_fun (*this, &SendUI::fast_update));
 }
 
 SendUI::~SendUI ()
 {
        _send->set_metering (false);
-       
+
        /* XXX not clear that we need to do this */
 
        screen_update_connection.disconnect();
@@ -78,21 +97,19 @@ SendUI::~SendUI ()
 }
 
 void
-SendUI::ins_changed (IOChange change, void* ignored)
-{
-       ENSURE_GUI_THREAD(bind (mem_fun (*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(bind (mem_fun (*this, &SendUI::outs_changed), change, ignored));
-       if (change & ConfigurationChanged) {
-               panners.setup_pan ();
-               gpm.setup_meters ();
+       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 ();
        }
 }
 
@@ -104,27 +121,28 @@ SendUI::update ()
 void
 SendUI::fast_update ()
 {
+       if (!is_mapped()) {
+               return;
+       }
+
        if (Config->get_meter_falloff() > 0.0f) {
-               gpm.update_meters ();
+               _gpm.update_meters ();
        }
 }
-       
-SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
-{
-       ui = new SendUI (s, ss);
 
-       vpacker.set_border_width (5);
+SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
+       : ArdourWindow (string (_("Send ")) + s->name())
+{
+       ui = new SendUI (this, s, session);
 
        hpacker.pack_start (*ui, true, true);
 
-       vpacker.pack_start (hpacker);
+       add (hpacker);
 
-       add (vpacker);
        set_name ("SendUIWindow");
 
-       s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
-
-       signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
+       ui->show ();
+       hpacker.show ();
 
 }
 
@@ -132,11 +150,3 @@ SendUIWindow::~SendUIWindow ()
 {
        delete ui;
 }
-
-void
-SendUIWindow::send_going_away ()
-{
-       ENSURE_GUI_THREAD (mem_fun (*this, &SendUIWindow::send_going_away));
-       delete_when_idle (this);
-}
-