diff options
| author | Robin Gareus <robin@gareus.org> | 2017-06-21 13:55:49 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-06-21 18:13:36 +0200 |
| commit | 8cd8cb165037906d5a35c8e147785845d0f4f808 (patch) | |
| tree | 81176c9ed1e90a44953370729a6b0f1091bebe10 /gtk2_ardour | |
| parent | d85ce601589451f834b690c3c0da1df66d025700 (diff) | |
Temporary session-format compatibility (revert before release)
Saving the new ControlList interpolation methods (enum) breaks loading
the session in older version. The session-format version will
need to be increased.
Until then:
* Fader automation + region gain envelope uses linear fades
* The automation-line visible in the GUI does not match the actual fade
(the y-axis is log/exp-scale, the fade is linear)
* Adding new points on the line is not using the correct initial value
* Custom changes of interpolation mode are not available
Neither of these issues is a regression.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/automation_line.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 9523df2c57..9c1aa13198 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -1168,6 +1168,7 @@ AutomationLine::view_to_model_coord (double& x, double& y) const void AutomationLine::view_to_model_coord_y (double& y) const { +#ifdef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX if (alist->default_interpolation () != alist->interpolation()) { switch (alist->interpolation()) { case AutomationList::Linear: @@ -1178,6 +1179,7 @@ AutomationLine::view_to_model_coord_y (double& y) const break; } } +#endif y = _desc.from_interface (y); } @@ -1202,6 +1204,7 @@ AutomationLine::apply_delta (double& val, double delta) const void AutomationLine::model_to_view_coord_y (double& y) const { +#ifdef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX if (alist->default_interpolation () != alist->interpolation()) { switch (alist->interpolation()) { case AutomationList::Linear: @@ -1212,6 +1215,7 @@ AutomationLine::model_to_view_coord_y (double& y) const break; } } +#endif y = _desc.to_interface (y); } diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 5e1395ff65..011c53997f 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -624,7 +624,7 @@ AutomationTimeAxisView::build_display_menu () items.push_back (MenuElem (_("Mode"), *auto_mode_menu)); } else { - +#ifdef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX Menu* auto_mode_menu = manage (new Menu); auto_mode_menu->set_name ("ArdourContextMenu"); MenuList& am_items = auto_mode_menu->items(); @@ -664,6 +664,7 @@ AutomationTimeAxisView::build_display_menu () delete auto_mode_menu; auto_mode_menu = 0; } +#endif } /* make sure the automation menu state is correct */ |