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 /libs/ardour/automation_list.cc | |
| parent | 766113a02414175b6e6635c582ce3888f344251f (diff) | |
Revert "Temporary session-format compatibility (revert before release)"
This reverts commit 8cd8cb165037906d5a35c8e147785845d0f4f808.
Diffstat (limited to 'libs/ardour/automation_list.cc')
| -rw-r--r-- | libs/ardour/automation_list.cc | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 3ffc040b62..a081418017 100644 --- 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) { |