diff options
| author | David Robillard <d@drobilla.net> | 2009-10-26 22:07:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-10-26 22:07:23 +0000 |
| commit | b6e90314b0087e870ad21ce658b92bd23851fe29 (patch) | |
| tree | 5b40dc9884e3cc74a21a239de7288bccbb9e8c5e /gtk2_ardour/automation_time_axis.cc | |
| parent | 93fccfca304425835171e994e98c1cb09c816521 (diff) | |
Don't prevent user from choosing Linear interpolation for controllers if they want to (just set default).
git-svn-id: svn://localhost/ardour2/branches/3.0@5933 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 63476b051b..8e0445c4eb 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -535,7 +535,7 @@ AutomationTimeAxisView::build_display_menu () /* mode menu */ - if ( EventTypeMap::instance().is_midi_parameter(_control->parameter()) ) { + if (EventTypeMap::instance().is_midi_parameter(_control->parameter())) { Menu* auto_mode_menu = manage (new Menu); auto_mode_menu->set_name ("ArdourContextMenu"); @@ -544,17 +544,18 @@ AutomationTimeAxisView::build_display_menu () RadioMenuItem::Group group; am_items.push_back (RadioMenuElem (group, _("Discrete"), bind ( - mem_fun(*this, &AutomationTimeAxisView::set_interpolation), - AutomationList::Discrete))); + mem_fun(*this, &AutomationTimeAxisView::set_interpolation), + AutomationList::Discrete))); mode_discrete_item = dynamic_cast<CheckMenuItem*>(&am_items.back()); mode_discrete_item->set_active(_control->list()->interpolation() == AutomationList::Discrete); - // For discrete types we dont allow the linear option since it makes no sense for those Controls + am_items.push_back (RadioMenuElem (group, _("Linear"), bind ( + mem_fun(*this, &AutomationTimeAxisView::set_interpolation), + AutomationList::Linear))); + mode_line_item = dynamic_cast<CheckMenuItem*>(&am_items.back()); + + // Set default interpolation type to linear if this isn't a (usually) discrete controller if (EventTypeMap::instance().interpolation_of(_control->parameter()) == Evoral::ControlList::Linear) { - am_items.push_back (RadioMenuElem (group, _("Line"), bind ( - mem_fun(*this, &AutomationTimeAxisView::set_interpolation), - AutomationList::Linear))); - mode_line_item = dynamic_cast<CheckMenuItem*>(&am_items.back()); mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear); } |