From 86d3735ea89504dfb280a6a435794383af482841 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 2 Oct 2017 19:43:55 +0200 Subject: Fix MIDI Automation interpolation options --- gtk2_ardour/automation_line.cc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gtk2_ardour/automation_line.cc') diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 2353b6c2fc..7e247044dd 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -1177,10 +1177,18 @@ AutomationLine::view_to_model_coord_y (double& y) const { if (alist->default_interpolation () != alist->interpolation()) { switch (alist->interpolation()) { + case AutomationList::Discrete: + /* toggles and MIDI only -- see is_stepped() */ + assert (alist->default_interpolation () == AutomationList::Linear); + break; case AutomationList::Linear: y = y * (_desc.upper - _desc.lower) + _desc.lower; return; default: + /* types that default to linear, can't be use + * Logarithmic or Exponential interpolation. + * "Curved" is invalid for automation (only x-fads) + */ assert (0); break; } @@ -1211,10 +1219,18 @@ AutomationLine::model_to_view_coord_y (double& y) const { if (alist->default_interpolation () != alist->interpolation()) { switch (alist->interpolation()) { + case AutomationList::Discrete: + /* toggles and MIDI only -- see is_stepped */ + assert (alist->default_interpolation () == AutomationList::Linear); + break; case AutomationList::Linear: y = (y - _desc.lower) / (_desc.upper - _desc.lower); return; default: + /* types that default to linear, can't be use + * Logarithmic or Exponential interpolation. + * "Curved" is invalid for automation (only x-fads) + */ assert (0); break; } -- cgit v1.2.3