Revert "Temporary session-format compatibility (revert before release)"

This reverts commit 8cd8cb165037906d5a35c8e147785845d0f4f808.

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 16ee210b25b1b56ebb50428b758de84a1a5502e1..a97ab0df07b73496afe93d41dbc521bc9af434ac 100644 (file)
--- 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 042d55babe194d08b65d121202b76defa95f69f4..4ff48464f7241d52f7f2661d2eb9252b2d662065 100644 (file)
--- 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 */

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 3ffc040b62a01b475b197dc266b098a67671f404..a081418017940f72ffe61d6926e3c8fd236a59e3 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -224,10 +224,6 @@ AutomationList::default_interpolation () const
                case GainAutomation:
                case BusSendLevel:
                case EnvelopeAutomation:
-#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
-                       /* use old, wrong linear gain interpolation */
-                       return ControlList::Linear;
-#endif
                        return ControlList::Exponential;
                        break;
                case TrimAutomation:
@@ -354,22 +350,7 @@ AutomationList::state (bool full, bool need_lock)
 
        root->set_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
        root->set_property ("id", id());
-
-#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
-       /* force new enums to existing ones in session-file */
-       Evoral::ControlList::InterpolationStyle is = _interpolation;
-       switch (is) {
-               case ControlList::Exponential:
-               case ControlList::Logarithmic:
-                       is = ControlList::Linear;
-                       break;
-               default:
-                       break;
-       }
-       root->set_property ("interpolation-style", is);
-#else
        root->set_property ("interpolation-style", _interpolation);
-#endif
 
        if (full) {
                /* never serialize state with Write enabled - too dangerous
@@ -544,12 +525,6 @@ AutomationList::set_state (const XMLNode& node, int version)
        if (!node.get_property (X_("interpolation-style"), _interpolation)) {
                _interpolation = default_interpolation ();
        }
-#ifndef XXX_NEW_INTERPOLATON__BREAK_SESSION_FORMAT_XXX
-       /* internally force logarithmic and Trim params to use Log-scale */
-       if (_desc.logarithmic || _parameter.type() == TrimAutomation) {
-               _interpolation = ControlList::Logarithmic;
-       }
-#endif
 
        if (node.get_property (X_("state"), _state)) {
                if (_state == Write) {