X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=63c86515207f3d49cd766c5ace916f51d4703f88;hb=129ace60e24aa7b5297563d389edbae1d70a3a80;hp=85e591a8ccbfab96b91861d96e4cb89f7f355dc0;hpb=68f86316118342847fdbd64f9d829692981b4f4c;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 85e591a8cc..63c8651520 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -19,12 +19,14 @@ #include +#include "ardour/amp.h" #include "ardour/io.h" #include "ardour/route.h" #include "ardour/route_group.h" #include "ardour/session.h" #include "ardour/session_route.h" #include "ardour/dB.h" +#include "ardour/utils.h" #include #include @@ -39,11 +41,11 @@ #include "ardour_ui.h" #include "gain_meter.h" -#include "utils.h" #include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" +#include "utils.h" #include "ardour/session.h" #include "ardour/route.h" @@ -55,8 +57,8 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; using namespace std; +using Gtkmm2ext::Keyboard; sigc::signal GainMeterBase::ResetAllPeakDisplays; sigc::signal GainMeterBase::ResetGroupPeakDisplays; @@ -73,19 +75,21 @@ GainMeter::setup_slider_pix () } } -GainMeterBase::GainMeterBase (Session& s, +GainMeterBase::GainMeterBase (Session* s, const Glib::RefPtr& pix, - bool horizontal) - : _session (s), - // 0.781787 is the value needed for gain to be set to 0. - gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1), - gain_automation_style_button (""), - gain_automation_state_button (""), - dpi_changed (false) - + bool horizontal, + int fader_length) + : gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1) // 0.781787 is the value needed for gain to be set to 0. + , gain_automation_style_button ("") + , gain_automation_state_button ("") + , dpi_changed (false) + , _is_midi (false) + { using namespace Menu_Helpers; + set_session (s); + ignore_toggle = false; meter_menu = 0; next_release_selects = false; @@ -93,27 +97,29 @@ GainMeterBase::GainMeterBase (Session& s, _width = Wide; if (horizontal) { - gain_slider = manage (new HSliderController (pix, + gain_slider = manage (new HSliderController (pix, &gain_adjustment, + fader_length, false)); } else { gain_slider = manage (new VSliderController (pix, &gain_adjustment, + fader_length, false)); } level_meter = new LevelMeter(_session); - gain_slider->signal_button_press_event().connect (mem_fun(*this, &GainMeter::start_gain_touch)); - gain_slider->signal_button_release_event().connect (mem_fun(*this, &GainMeter::end_gain_touch)); + gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::start_gain_touch)); + gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::end_gain_touch)); gain_slider->set_name ("GainFader"); gain_display.set_name ("MixerStripGainDisplay"); gain_display.set_has_frame (false); set_size_request_to_display_given_text (gain_display, "-80.g", 2, 6); /* note the descender */ - gain_display.signal_activate().connect (mem_fun (*this, &GainMeter::gain_activated)); - gain_display.signal_focus_in_event().connect (mem_fun (*this, &GainMeter::gain_focused), false); - gain_display.signal_focus_out_event().connect (mem_fun (*this, &GainMeter::gain_focused), false); + gain_display.signal_activate().connect (sigc::mem_fun (*this, &GainMeter::gain_activated)); + gain_display.signal_focus_in_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); + gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); peak_display.set_name ("MixerStripPeakDisplay"); // peak_display.set_has_frame (false); @@ -126,31 +132,31 @@ GainMeterBase::GainMeterBase (Session& s, gain_automation_style_button.set_name ("MixerAutomationModeButton"); gain_automation_state_button.set_name ("MixerAutomationPlaybackButton"); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Fader automation type")); + ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); + ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.set_size_request(15, 15); gain_automation_style_button.set_size_request(15, 15); - + gain_astyle_menu.items().push_back (MenuElem (_("Trim"))); gain_astyle_menu.items().push_back (MenuElem (_("Abs"))); - + gain_astate_menu.set_name ("ArdourContextMenu"); gain_astyle_menu.set_name ("ArdourContextMenu"); - gain_adjustment.signal_value_changed().connect (mem_fun(*this, &GainMeterBase::gain_adjusted)); - peak_display.signal_button_release_event().connect (mem_fun(*this, &GainMeterBase::peak_button_release), false); - gain_display.signal_key_press_event().connect (mem_fun(*this, &GainMeterBase::gain_key_press), false); + gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted)); + peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeterBase::peak_button_release), false); + gain_display.signal_key_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_key_press), false); - ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeterBase::reset_peak_display)); - ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeterBase::reset_group_peak_display)); + ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_peak_display)); + ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_group_peak_display)); - UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeterBase::on_theme_changed)); - ColorsChanged.connect (bind(mem_fun (*this, &GainMeterBase::color_handler), false)); - DPIReset.connect (bind(mem_fun (*this, &GainMeterBase::color_handler), true)); + UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed)); + ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false)); + DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true)); } GainMeterBase::~GainMeterBase () @@ -160,57 +166,74 @@ GainMeterBase::~GainMeterBase () } void -GainMeterBase::set_io (boost::shared_ptr io) +GainMeterBase::set_controls (boost::shared_ptr r, + boost::shared_ptr pm, + boost::shared_ptr amp) { connections.clear (); - - _io = io; - - if (!_io) { + model_connections.drop_connections (); + + if (!pm && !amp) { level_meter->set_meter (0); gain_slider->set_controllable (boost::shared_ptr()); + _meter.reset (); + _amp.reset (); + _route.reset (); return; - } + } - level_meter->set_meter (&_io->peak_meter()); - gain_slider->set_controllable (_io->gain_control()); + _meter = pm; + _amp = amp; + _route = r; - boost::shared_ptr r; + level_meter->set_meter (pm.get()); + gain_slider->set_controllable (amp->gain_control()); - if ((r = boost::dynamic_pointer_cast (_io)) != 0) { + if (!_route || _route->output()->n_ports().n_midi() == 0) { + _is_midi = false; + gain_adjustment.set_lower (0.0); + gain_adjustment.set_upper (1.0); + gain_adjustment.set_step_increment (0.01); + gain_adjustment.set_page_increment (0.1); + } else { + _is_midi = true; + gain_adjustment.set_lower (0.0); + gain_adjustment.set_upper (2.0); + gain_adjustment.set_step_increment (0.05); + gain_adjustment.set_page_increment (0.1); + } - if (!r->is_hidden()) { + if (!_route || !_route->is_hidden()) { - using namespace Menu_Helpers; - - gain_astate_menu.items().clear (); - - gain_astate_menu.items().push_back (MenuElem (_("Manual"), - bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Off))); - gain_astate_menu.items().push_back (MenuElem (_("Play"), - bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Play))); - gain_astate_menu.items().push_back (MenuElem (_("Write"), - bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Write))); - gain_astate_menu.items().push_back (MenuElem (_("Touch"), - bind (mem_fun (*_io, &IO::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Touch))); - - connections.push_back (gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false)); - connections.push_back (gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false)); - - connections.push_back (r->gain_control()->alist()->automation_state_changed.connect (mem_fun(*this, &GainMeter::gain_automation_state_changed))); - connections.push_back (r->gain_control()->alist()->automation_style_changed.connect (mem_fun(*this, &GainMeter::gain_automation_style_changed))); - - gain_automation_state_changed (); - } - } + using namespace Menu_Helpers; + + gain_astate_menu.items().clear (); - //cerr << "Connect " << this << " to gain change for " << _io->name() << endl; + gain_astate_menu.items().push_back (MenuElem (_("Manual"), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + Evoral::Parameter(GainAutomation), (AutoState) Off))); + gain_astate_menu.items().push_back (MenuElem (_("Play"), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + Evoral::Parameter(GainAutomation), (AutoState) Play))); + gain_astate_menu.items().push_back (MenuElem (_("Write"), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + Evoral::Parameter(GainAutomation), (AutoState) Write))); + gain_astate_menu.items().push_back (MenuElem (_("Touch"), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + Evoral::Parameter(GainAutomation), (AutoState) Touch))); - connections.push_back (_io->gain_control()->Changed.connect (mem_fun(*this, &GainMeterBase::gain_changed))); + connections.push_back (gain_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false)); + connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false)); + + boost::shared_ptr gc = amp->gain_control(); + + gc->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context()); + gc->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context()); + + gain_automation_state_changed (); + } + + amp->gain_control()->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context()); gain_changed (); show_gain (); @@ -243,7 +266,7 @@ GainMeterBase::setup_meters (int len) level_meter->setup_meters(len, 5); } -void +void GainMeter::setup_meters (int len) { if (!meter_metric_area.get_parent()) { @@ -272,10 +295,8 @@ GainMeterBase::peak_button_release (GdkEventButton* ev) if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier|Keyboard::TertiaryModifier)) { ResetAllPeakDisplays (); } else if (ev->button == 1 && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - boost::shared_ptr r; - - if ((r = boost::dynamic_pointer_cast (_io)) != 0) { - ResetGroupPeakDisplays (r->mix_group()); + if (_route) { + ResetGroupPeakDisplays (_route->route_group()); } } else { reset_peak_display (); @@ -287,12 +308,7 @@ GainMeterBase::peak_button_release (GdkEventButton* ev) void GainMeterBase::reset_peak_display () { - boost::shared_ptr r; - - if ((r = boost::dynamic_pointer_cast (_io)) != 0) { - r->peak_meter().reset_max(); - } - + _meter->reset_max(); level_meter->clear_meters(); max_peak = -INFINITY; peak_display.set_label (_("-Inf")); @@ -302,13 +318,9 @@ GainMeterBase::reset_peak_display () void GainMeterBase::reset_group_peak_display (RouteGroup* group) { - boost::shared_ptr r; - - if ((r = boost::dynamic_pointer_cast (_io)) != 0) { - if (group == r->mix_group()) { - reset_peak_display (); + if (_route && group == _route->route_group()) { + reset_peak_display (); } - } } void @@ -354,7 +366,7 @@ GainMeterBase::gain_activated () f = min (f, 6.0f); - _io->gain_control()->set_value (dB_to_coefficient(f)); + _amp->set_gain (dB_to_coefficient(f), this); if (gain_display.has_focus()) { PublicEditor::instance().reset_focus(); @@ -368,39 +380,57 @@ GainMeterBase::show_gain () char buf[32]; float v = gain_adjustment.get_value(); - - if (v == 0.0) { - strcpy (buf, _("-inf")); + + if (!_is_midi) { + if (v == 0.0) { + strcpy (buf, _("-inf")); + } else { + snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (v))); + } } else { - snprintf (buf, 32, "%.1f", coefficient_to_dB (slider_position_to_gain (v))); + snprintf (buf, sizeof (buf), "%.1f", v); } - + gain_display.set_text (buf); } void GainMeterBase::gain_adjusted () { - //cerr << this << " for " << _io->name() << " GAIN ADJUSTED\n"; if (!ignore_toggle) { - //cerr << "Set GC\n"; - _io->gain_control()->set_value (slider_position_to_gain (gain_adjustment.get_value())); - //cerr << "Set GC OUT\n"; + if (_route) { + if (_route->amp() == _amp) { + if (_is_midi) { + _route->set_gain (gain_adjustment.get_value(), this); + } else { + _route->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this); + } + } else { + _amp->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this); + } + } } + show_gain (); } void GainMeterBase::effective_gain_display () { - gfloat value = gain_to_slider_position (_io->effective_gain()); - + gfloat value; + + if (!_route || _route->output()->n_ports().n_midi() == 0) { + value = gain_to_slider_position (_amp->gain()); + } else { + value = _amp->gain (); + } + //cerr << this << " for " << _io->name() << " EGAIN = " << value // << " AGAIN = " << gain_adjustment.get_value () << endl; // stacktrace (cerr, 20); if (gain_adjustment.get_value() != value) { - ignore_toggle = true; + ignore_toggle = true; gain_adjustment.set_value (value); ignore_toggle = false; } @@ -409,7 +439,7 @@ GainMeterBase::effective_gain_display () void GainMeterBase::gain_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &GainMeterBase::effective_gain_display)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&GainMeterBase::effective_gain_display, this)); } void @@ -427,11 +457,10 @@ GainMeterBase::set_fader_name (const char * name) void GainMeterBase::update_gain_sensitive () { - static_cast(gain_slider)->set_sensitive ( - !(_io->gain_control()->alist()->automation_state() & Play)); + bool x = !(_amp->gain_control()->alist()->automation_state() & Play); + static_cast(gain_slider)->set_sensitive (x); } - static MeterPoint next_meter_point (MeterPoint mp) { @@ -439,15 +468,20 @@ next_meter_point (MeterPoint mp) case MeterInput: return MeterPreFader; break; - + case MeterPreFader: return MeterPostFader; break; - + case MeterPostFader: - return MeterInput; + return MeterCustom; + break; + + case MeterCustom: + return MeterInput; break; } + /*NOTREACHED*/ return MeterInput; } @@ -455,18 +489,16 @@ next_meter_point (MeterPoint mp) gint GainMeterBase::meter_press(GdkEventButton* ev) { - boost::shared_ptr _route; - wait_for_release = false; - - if ((_route = boost::dynamic_pointer_cast(_io)) == 0) { + + if (!_route) { return FALSE; } if (!ignore_toggle) { if (Keyboard::is_context_menu_event (ev)) { - + // no menu at this time. } else { @@ -475,49 +507,39 @@ GainMeterBase::meter_press(GdkEventButton* ev) // Primary-button2 click is the midi binding click // button2-click is "momentary" - + if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { wait_for_release = true; old_meter_point = _route->meter_point (); } } - if (ev->button == 1 || Keyboard::is_button2_event (ev)) { + if (_route && (ev->button == 1 || Keyboard::is_button2_event (ev))) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { /* Primary+Tertiary-click applies change to all routes */ - _session.begin_reversible_command (_("meter point change")); - Session::GlobalMeteringStateCommand *cmd = new Session::GlobalMeteringStateCommand (_session, this); - _session.foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point())); - cmd->mark(); - _session.add_command (cmd); - _session.commit_reversible_command (); - - + _session->foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point())); + + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { /* Primary-click: solo mix group. NOTE: Primary-button2 is MIDI learn. */ - + if (ev->button == 1) { - _session.begin_reversible_command (_("meter point change")); - Session::GlobalMeteringStateCommand *cmd = new Session::GlobalMeteringStateCommand (_session, this); set_mix_group_meter_point (*_route, next_meter_point (_route->meter_point())); - cmd->mark(); - _session.add_command (cmd); - _session.commit_reversible_command (); } - + } else { - + /* click: change just this route */ // XXX no undo yet - - _route->set_meter_point (next_meter_point (_route->meter_point()), this); + + _route->set_meter_point (next_meter_point (_route->meter_point())); } } } @@ -528,16 +550,14 @@ GainMeterBase::meter_press(GdkEventButton* ev) } gint -GainMeterBase::meter_release(GdkEventButton* ev) +GainMeterBase::meter_release(GdkEventButton*) { if(!ignore_toggle){ if (wait_for_release){ wait_for_release = false; - - boost::shared_ptr r; - - if ((r = boost::dynamic_pointer_cast(_io)) != 0) { - set_meter_point (*r, old_meter_point); + + if (_route) { + set_meter_point (*_route, old_meter_point); } } } @@ -548,7 +568,7 @@ GainMeterBase::meter_release(GdkEventButton* ev) void GainMeterBase::set_meter_point (Route& route, MeterPoint mp) { - route.set_meter_point (mp, this); + route.set_meter_point (mp); } void @@ -556,34 +576,32 @@ GainMeterBase::set_mix_group_meter_point (Route& route, MeterPoint mp) { RouteGroup* mix_group; - if((mix_group = route.mix_group()) != 0){ - mix_group->apply (&Route::set_meter_point, mp, this); + if((mix_group = route.route_group()) != 0){ + mix_group->apply (&Route::set_meter_point, mp); } else { - route.set_meter_point (mp, this); + route.set_meter_point (mp); } } void GainMeterBase::meter_point_clicked () { - boost::shared_ptr r; - - if ((r = boost::dynamic_pointer_cast (_io)) != 0) { + if (_route) { /* WHAT? */ } } gint -GainMeterBase::start_gain_touch (GdkEventButton* ev) +GainMeterBase::start_gain_touch (GdkEventButton*) { - _io->gain_control()->start_touch (); + _amp->gain_control()->start_touch (); return FALSE; } gint -GainMeterBase::end_gain_touch (GdkEventButton* ev) +GainMeterBase::end_gain_touch (GdkEventButton*) { - _io->gain_control()->stop_touch (); + _amp->gain_control()->stop_touch (); return FALSE; } @@ -593,7 +611,7 @@ GainMeterBase::gain_automation_state_button_event (GdkEventButton *ev) if (ev->type == GDK_BUTTON_RELEASE) { return TRUE; } - + switch (ev->button) { case 1: gain_astate_menu.popup (1, ev->time); @@ -686,10 +704,10 @@ GainMeterBase::gain_automation_style_changed () { switch (_width) { case Wide: - gain_automation_style_button.set_label (astyle_string(_io->gain_control()->alist()->automation_style())); + gain_automation_style_button.set_label (astyle_string(_amp->gain_control()->alist()->automation_style())); break; case Narrow: - gain_automation_style_button.set_label (short_astyle_string(_io->gain_control()->alist()->automation_style())); + gain_automation_style_button.set_label (short_astyle_string(_amp->gain_control()->alist()->automation_style())); break; } } @@ -697,21 +715,21 @@ GainMeterBase::gain_automation_style_changed () void GainMeterBase::gain_automation_state_changed () { - ENSURE_GUI_THREAD(mem_fun(*this, &GainMeterBase::gain_automation_state_changed)); - + ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed) + bool x; switch (_width) { case Wide: - gain_automation_state_button.set_label (astate_string(_io->gain_control()->alist()->automation_state())); + gain_automation_state_button.set_label (astate_string(_amp->gain_control()->alist()->automation_state())); break; case Narrow: - gain_automation_state_button.set_label (short_astate_string(_io->gain_control()->alist()->automation_state())); + gain_automation_state_button.set_label (short_astate_string(_amp->gain_control()->alist()->automation_state())); break; } - x = (_io->gain_control()->alist()->automation_state() != Off); - + x = (_amp->gain_control()->alist()->automation_state() != Off); + if (gain_automation_state_button.get_active() != x) { ignore_toggle = true; gain_automation_state_button.set_active (x); @@ -719,13 +737,13 @@ GainMeterBase::gain_automation_state_changed () } update_gain_sensitive (); - + /* start watching automation so that things move */ - + gain_watching.disconnect(); if (x) { - gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &GainMeterBase::effective_gain_display)); + gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); } } @@ -771,8 +789,8 @@ GainMeterBase::on_theme_changed() style_changed = true; } -GainMeter::GainMeter (Session& s) - : GainMeterBase (s, slider, false) +GainMeter::GainMeter (Session* s, int fader_length) + : GainMeterBase (s, slider, false, fader_length) { gain_display_box.set_homogeneous (true); gain_display_box.set_spacing (2); @@ -784,8 +802,8 @@ GainMeter::GainMeter (Session& s) gain_automation_style_button.set_name ("MixerAutomationModeButton"); gain_automation_state_button.set_name ("MixerAutomationPlaybackButton"); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Fader automation type")); + ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); + ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); @@ -808,11 +826,13 @@ GainMeter::GainMeter (Session& s) pack_start (gain_display_box, Gtk::PACK_SHRINK); pack_start (hbox, Gtk::PACK_SHRINK); - meter_metric_area.signal_expose_event().connect (mem_fun(*this, &GainMeter::meter_metrics_expose)); + meter_metric_area.signal_expose_event().connect (sigc::mem_fun(*this, &GainMeter::meter_metrics_expose)); } void -GainMeter::set_io (boost::shared_ptr io) +GainMeter::set_controls (boost::shared_ptr r, + boost::shared_ptr meter, + boost::shared_ptr amp) { if (level_meter->get_parent()) { hbox.remove (*level_meter); @@ -826,32 +846,22 @@ GainMeter::set_io (boost::shared_ptr io) fader_vbox->remove (gain_automation_state_button); } - GainMeterBase::set_io (io); + GainMeterBase::set_controls (r, meter, amp); - boost::shared_ptr r; + /* + if we have a non-hidden route (ie. we're not the click or the auditioner), + pack some route-dependent stuff. + */ - if ((r = boost::dynamic_pointer_cast (_io)) != 0) { - - /* - if we have a non-hidden route (ie. we're not the click or the auditioner), - pack some route-dependent stuff. - */ - - gain_display_box.pack_end (peak_display, true, true); - hbox.pack_end (*level_meter, true, true); + gain_display_box.pack_end (peak_display, true, true); + hbox.pack_end (*level_meter, true, true); - if (!r->is_hidden()) { - fader_vbox->pack_start (gain_automation_state_button, false, false, 0); - } - - } else { - - /* we're managing a non-Route IO (e.g. Send) */ - - gain_display_box.pack_end (peak_display, true, true); - hbox.pack_end (*level_meter, true, true); + if (r && !r->is_hidden()) { fader_vbox->pack_start (gain_automation_state_button, false, false, 0); } + + setup_meters (); + hbox.show_all (); } int @@ -873,7 +883,7 @@ GainMeter::render_metrics (Gtk::Widget& w) char buf[32]; win->get_size (width, height); - + Glib::RefPtr pixmap = Gdk::Pixmap::create (win, width, height); metric_pixmaps[w.get_name()] = pixmap; @@ -917,7 +927,7 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev) gint width, height; win->get_size (width, height); - + base_rect.width = width; base_rect.height = height; base_rect.x = 0; @@ -941,7 +951,11 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev) boost::shared_ptr GainMeterBase::get_controllable() { - return _io->gain_control(); + if (_amp) { + return _amp->gain_control(); + } else { + return boost::shared_ptr(); + } }