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 | |
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')
-rw-r--r-- | gtk2_ardour/gain_meter.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 46 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 12 |
4 files changed, 37 insertions, 27 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 5c64396b1c..8ef83cfad5 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -475,6 +475,10 @@ next_meter_point (MeterPoint mp) break; case MeterPostFader: + return MeterOutput; + break; + + case MeterOutput: return MeterCustom; break; 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(); diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 58eb2a0e19..6ffb1ad907 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -288,6 +288,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width width, bool input_button); void port_connected_or_disconnected (ARDOUR::Port *, ARDOUR::Port *); + + static std::string meter_point_string (ARDOUR::MeterPoint); }; #endif /* __ardour_mixer_strip__ */ diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index fdd51a3441..722612d21c 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1103,6 +1103,18 @@ RCOptionEditor::RCOptionEditor () add_option (_("Audio"), pp); + ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> ( + "afl-position", + _("AFL signals come from"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position) + ); + + pa->add (AFLFromBeforeProcessors, _("post-fader but before post-fader processors")); + pa->add (AFLFromAfterProcessors, _("after post-fader processors")); + + add_option (_("Audio"), pa); + add_option (_("Audio"), new BoolOption ( "tape-machine-mode", |