diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-07 17:43:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-02-07 17:43:55 +0000 |
| commit | b08d13706f9e98fc75a727822209942c00d8f1b3 (patch) | |
| tree | 4a6fd2881755a340cabcd4a79657f6bb682625de /gtk2_ardour/gain_meter.cc | |
| parent | 86a9d45ad072809c06e41e3c10683f0f0ee6a4a6 (diff) | |
remove additional "mid" color from ArdourButton; replace Active/Mid widget state with ExplicitActive/ImplicitActive; represent implicit-active state with colored border around ArdourButton; tune button colors; new rounded_foo() functions, some in use, some not in use right now
git-svn-id: svn://localhost/ardour2/branches/3.0@11466 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 0324f3d93c..d651604df9 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -206,7 +206,7 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r, gain_astate_menu.items().push_back (MenuElem (S_("Automation|Manual"), sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), - Evoral::Parameter(GainAutomation), (AutoState) Off))); + Evoral::Parameter(GainAutomation), (AutoState) ARDOUR::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))); @@ -710,7 +710,7 @@ GainMeterBase::_astate_string (AutoState state, bool shrt) string sstr; switch (state) { - case Off: + case ARDOUR::Off: sstr = (shrt ? "M" : _("M")); break; case Play: @@ -780,7 +780,7 @@ GainMeterBase::gain_automation_state_changed () break; } - x = (_amp->gain_control()->alist()->automation_state() != Off); + x = (_amp->gain_control()->alist()->automation_state() != ARDOUR::Off); if (gain_automation_state_button.get_active() != x) { ignore_toggle = true; |