diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 17:04:06 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 17:04:06 +0000 |
commit | 14277ff831c90dbdd1131a44eac86da919bb0544 (patch) | |
tree | 2c33ee003e20649dccda5cdf242933962fa9feec /gtk2_ardour/mixer_strip.cc | |
parent | 3bed0850babcdb68ecc61b5957349ba353605270 (diff) |
Add AFLFrom... enums as counterpart to PFLFrom ; add Output metering as a new fixed meter point; clean up logic in Route::setup_invisible_processors() to correctly place meters and monitor sends in various modes
git-svn-id: svn://localhost/ardour2/branches/3.0@8923 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 46 |
1 files changed, 19 insertions, 27 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 8794381229..f754ef2863 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -427,23 +427,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) } } - switch (_route->meter_point()) { - case MeterInput: - meter_point_label.set_text (_("input")); - break; - - case MeterPreFader: - meter_point_label.set_text (_("pre")); - break; - - case MeterPostFader: - meter_point_label.set_text (_("post")); - break; - - case MeterCustom: - meter_point_label.set_text (_("custom")); - break; - } + meter_point_label.set_text (meter_point_string (_route->meter_point())); delete route_ops_menu; route_ops_menu = 0; @@ -1588,30 +1572,38 @@ MixerStrip::engine_running () { } -/** Called when the metering point has changed */ -void -MixerStrip::meter_changed () +string +MixerStrip::meter_point_string (MeterPoint mp) { - ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed) - - switch (_route->meter_point()) { + switch (mp) { case MeterInput: - meter_point_label.set_text (_("input")); + return _("in"); break; case MeterPreFader: - meter_point_label.set_text (_("pre")); + return _("pre"); break; case MeterPostFader: - meter_point_label.set_text (_("post")); + return _("post"); + break; + + case MeterOutput: + return _("out"); break; case MeterCustom: - meter_point_label.set_text (_("custom")); + default: + return _("custom"); break; } +} +/** Called when the metering point has changed */ +void +MixerStrip::meter_changed () +{ + meter_point_label.set_text (meter_point_string (_route->meter_point())); gpm.setup_meters (); // reset peak when meter point changes gpm.reset_peak_display(); |