fix a bad transition in the transportFSM.

[ardour.git] / libs / ardour / automation_list.cc

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 3ffc040b62a01b475b197dc266b098a67671f404..fa7854873c0d67315836556a5e54cd6c38ab952d 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -1,21 +1,25 @@
 /*
-    Copyright (C) 2002 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2008-2012 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2008-2014 David Robillard <d@drobilla.net>
+ * Copyright (C) 2009-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2012-2017 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2015 Nick Mainsbridge <mainsbridge@gmail.com>
+ * Copyright (C) 2016 Tim Mayberry <mojofunk@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <set>
 #include <climits>
@@ -24,13 +28,13 @@
 #include <sstream>
 #include <algorithm>
 #include "ardour/automation_list.h"
-#include "ardour/beats_frames_converter.h"
+#include "ardour/beats_samples_converter.h"
 #include "ardour/event_type_map.h"
 #include "ardour/parameter_descriptor.h"
 #include "ardour/parameter_types.h"
 #include "ardour/evoral_types_convert.h"
 #include "ardour/types_convert.h"
-#include "evoral/Curve.hpp"
+#include "evoral/Curve.h"
 #include "pbd/memento_command.h"
 #include "pbd/stacktrace.h"
 #include "pbd/enumwriter.h"
@@ -224,10 +228,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:
@@ -311,7 +311,7 @@ AutomationList::thaw ()
 }
 
 bool
-AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsFramesConverter const& bfc)
+AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsSamplesConverter const& bfc)
 {
        AutomationType src_type = (AutomationType)alist.parameter().type();
        AutomationType dst_type = (AutomationType)_parameter.type();
@@ -319,13 +319,13 @@ AutomationList::paste (const ControlList& alist, double pos, DoubleBeatsFramesCo
        if (parameter_is_midi (src_type) == parameter_is_midi (dst_type)) {
                return ControlList::paste (alist, pos);
        }
-       bool to_frame = parameter_is_midi (src_type);
+       bool to_sample = parameter_is_midi (src_type);
 
        ControlList cl (alist);
        cl.clear ();
        for (const_iterator i = alist.begin ();i != alist.end (); ++i) {
                double when = (*i)->when;
-               if (to_frame) {
+               if (to_sample) {
                        when = bfc.to ((*i)->when);
                } else {
                        when = bfc.from ((*i)->when);
@@ -348,30 +348,15 @@ AutomationList::get_state ()
 }
 
 XMLNode&
-AutomationList::state (bool full, bool need_lock)
+AutomationList::state (bool save_auto_state, bool need_lock)
 {
        XMLNode* root = new XMLNode (X_("AutomationList"));
 
        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) {
+       if (save_auto_state) {
                /* never serialize state with Write enabled - too dangerous
                   for the user's data
                */
@@ -544,12 +529,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) {