From 2c231282baa596219506c1ee4632708977cc0714 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 7 May 2009 17:31:18 +0000 Subject: Returns (i.e. sidechains). And lo, upon the revision of our hoarde 5061, was the last Big Feature committed to Three Poino, who, now more than ever, lurks imposingly on the sidelines, heir to the throne, and eventual ruler of the realm. His eventual succession all but guaranteed, only time and the number of heads that must roll remain mysteries. git-svn-id: svn://localhost/ardour2/branches/3.0@5061 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/send_ui.cc | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'gtk2_ardour/send_ui.cc') diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index 1014f5a07a..664092d39f 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -34,24 +34,24 @@ using namespace PBD; SendUI::SendUI (boost::shared_ptr s, Session& se) : _send (s) , _session (se) - , gpm (se) - , panners (se) + , _gpm (se) + , _panners (se) { - panners.set_io (s->io()); - gpm.set_io (s->io()); + _panners.set_io (s->io()); + _gpm.set_io (s->io()); - hbox.pack_start (gpm, true, true); + _hbox.pack_start (_gpm, true, true); set_name ("SendUIFrame"); - vbox.set_spacing (5); - vbox.set_border_width (5); + _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 = manage (new IOSelector (se, s->io(), true)); - pack_start (vbox, false, false); + pack_start (_vbox, false, false); pack_start (*io, true, true); @@ -62,14 +62,16 @@ SendUI::SendUI (boost::shared_ptr s, Session& se) _send->io()->input_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 (); + _panners.set_width (Wide); + _panners.setup_pan (); - gpm.setup_meters (); - gpm.set_fader_name ("SendUIFrame"); + _gpm.setup_meters (); + _gpm.set_fader_name ("SendUIFrame"); - // 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)); + // 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)); } SendUI::~SendUI () @@ -87,7 +89,7 @@ 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 (); + _panners.setup_pan (); } } @@ -96,8 +98,8 @@ 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 (); + _panners.setup_pan (); + _gpm.setup_meters (); } } @@ -110,7 +112,7 @@ void SendUI::fast_update () { if (Config->get_meter_falloff() > 0.0f) { - gpm.update_meters (); + _gpm.update_meters (); } } @@ -126,9 +128,12 @@ SendUIWindow::SendUIWindow (boost::shared_ptr s, Session& ss) set_name ("SendUIWindow"); - going_away_connection = s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away)); + 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 (this))); + signal_delete_event().connect (bind ( + ptr_fun (just_hide_it), + reinterpret_cast (this))); } SendUIWindow::~SendUIWindow () -- cgit v1.2.3