diff options
| author | Robin Gareus <robin@gareus.org> | 2017-08-16 05:02:22 +0200 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:52 -0400 |
| commit | 1545c426d9e3bc0411f3b5532c0c5a9eb09394c8 (patch) | |
| tree | b233e16d30436267ea406786602245755c2f8e3d /gtk2_ardour | |
| parent | 766113a02414175b6e6635c582ce3888f344251f (diff) | |
Revert "Temporary session-format compatibility (revert before release)"
This reverts commit 8cd8cb165037906d5a35c8e147785845d0f4f808.
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, 1 insertions, 6 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 16ee210b25..a97ab0df07 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -1175,7 +1175,6 @@ 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: @@ -1186,7 +1185,6 @@ AutomationLine::view_to_model_coord_y (double& y) const break; } } -#endif y = _desc.from_interface (y); } @@ -1211,7 +1209,6 @@ 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: @@ -1222,7 +1219,6 @@ 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 042d55babe..4ff48464f7 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -652,7 +652,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(); @@ -692,7 +692,6 @@ AutomationTimeAxisView::build_display_menu () delete auto_mode_menu; auto_mode_menu = 0; } -#endif } /* make sure the automation menu state is correct */ |