diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-23 20:02:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-23 20:02:15 +0000 |
| commit | d13fdaa9d19e0db68ddcc792c3c3bb8ff661a72e (patch) | |
| tree | a433b453635319ce91470d43189d3b88336ec488 /gtk2_ardour/mixer_strip.cc | |
| parent | d45dfa5cb602da24d2cbcbca00ff7c69ba18c4cb (diff) | |
make RouteGroup gain control work again ; fix what solo button label shows under different conditions; other miscellania
git-svn-id: svn://localhost/ardour2/branches/3.0@5262 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 6ba9c655d8..1b1e28cda9 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -75,7 +75,7 @@ int MixerStrip::scrollbar_height = 0; MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer) : AxisView(sess) - , RouteUI (sess, _("Mute"), _("Solo"), _("Record")) + , RouteUI (sess) ,_mixer(mx) , _mixer_owned (in_mixer) , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), this, in_mixer) @@ -102,7 +102,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, bool in_mixer) MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt, bool in_mixer) : AxisView(sess) - , RouteUI (sess, _("Mute"), _("Solo"), _("Record")) + , RouteUI (sess) ,_mixer(mx) , _mixer_owned (in_mixer) , pre_processor_box (PreFader, sess, mx.plugin_selector(), mx.selection(), this, in_mixer) @@ -117,6 +117,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt { init (); + set_button_names (); set_route (rt); } @@ -1489,6 +1490,25 @@ MixerStrip::revert_to_default_display () } void +MixerStrip::set_button_names () +{ + rec_enable_button_label.set_text (_("Rec")); + mute_button_label.set_text (_("Mute")); + + switch (Config->get_solo_model()) { + case SoloInPlace: + solo_button_label.set_text (_("Solo")); + break; + case SoloAFL: + solo_button_label.set_text (_("AFL")); + break; + case SoloPFL: + solo_button_label.set_text (_("PFL")); + break; + } +} + +void MixerStrip::set_route_group_to_new () { RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active); @@ -1504,3 +1524,4 @@ MixerStrip::set_route_group_to_new () delete g; } } + |