11 files changed, 9 insertions, 72 deletions
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index ce31721802..99e7891ce8 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <ardour/session_object.h>
-#include <ardour/automation_event.h>
+#include <ardour/automation_list.h>
 #include <ardour/automation_control.h>
 #include <ardour/parameter.h>
 #include <evoral/ControlSet.hpp>
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h
index c414f7bc40..24d1db3eec 100644
--- a/libs/ardour/ardour/automation_control.h
+++ b/libs/ardour/ardour/automation_control.h
@@ -25,7 +25,7 @@
 #include <pbd/controllable.h>
 #include <ardour/parameter.h>
 #include <evoral/Control.hpp>
-#include <ardour/automation_event.h>
+#include <ardour/automation_list.h>
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_list.h
index ed3379bc15..ed3379bc15 100644
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_list.h
diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h
index 9ba3689e82..b0785a6e59 100644
--- a/libs/ardour/ardour/crossfade.h
+++ b/libs/ardour/ardour/crossfade.h
@@ -30,9 +30,9 @@
 #include <pbd/statefuldestructible.h> 
 
 #include <ardour/ardour.h>
-#include <ardour/curve.h>
 #include <ardour/audioregion.h>
 #include <ardour/crossfade_compare.h>
+#include <evoral/Curve.hpp>
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/curve.h b/libs/ardour/ardour/curve.h
deleted file mode 100644
index 433b00a270..0000000000
--- a/libs/ardour/ardour/curve.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    Copyright (C) 2001-2007 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.
-
-*/
-
-#ifndef __ardour_curve_h__
-#define __ardour_curve_h__
-
-#include <sys/types.h>
-#include <boost/utility.hpp>
-#include <sigc++/signal.h>
-#include <glibmm/thread.h>
-#include <pbd/undo.h>
-#include <list>
-#include <algorithm>
-#include <ardour/automation_event.h>
-
-namespace ARDOUR {
-
-class Curve : public boost::noncopyable
-{
-  public:
-	Curve (const AutomationList& al);
-
-	bool rt_safe_get_vector (double x0, double x1, float *arg, int32_t veclen);
-	void get_vector (double x0, double x1, float *arg, int32_t veclen);
-
-	void solve ();
-
-  private:
-	double unlocked_eval (double where);
-	double multipoint_eval (double x);
-
-	void _get_vector (double x0, double x1, float *arg, int32_t veclen);
-
-	void on_list_dirty() { _dirty = true; }
-	
-	bool                  _dirty;
-	const AutomationList& _list;
-};
-
-} // namespace ARDOUR
-
-extern "C" {
-	void curve_get_vector_from_c (void *arg, double, double, float*, int32_t);
-}
-
-#endif /* __ardour_curve_h__ */
diff --git a/libs/ardour/ardour/gain.h b/libs/ardour/ardour/gain.h
index e57cfdc0d7..0c7d9f957d 100644
--- a/libs/ardour/ardour/gain.h
+++ b/libs/ardour/ardour/gain.h
@@ -21,7 +21,8 @@
 #define __ardour_gain_h__
 
 #include "ardour.h"
-#include "curve.h"
+#include "automation_list.h"
+#include <evoral/Curve.hpp>
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index b44e131d8a..6cae11a7fa 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -36,7 +36,6 @@
 #include <ardour/ardour.h>
 #include <ardour/automatable.h>
 #include <ardour/utils.h>
-#include <ardour/curve.h>
 #include <ardour/types.h>
 #include <ardour/data_type.h>
 #include <ardour/port_set.h>
diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index a535ce3bb4..d2bd210516 100644
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -34,7 +34,7 @@
 #include <ardour/ardour.h>
 #include <ardour/processor.h>
 #include <ardour/io.h>
-#include <ardour/automation_event.h>
+#include <ardour/automation_list.h>
 
 using std::map;
 using std::set;
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 1b85495d7a..47ef212d58 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -31,7 +31,6 @@
 #include <pbd/controllable.h>
 
 #include <ardour/types.h>
-#include <ardour/curve.h>
 #include <ardour/automation_control.h>
 
 using std::istream;
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 8db9fb14fe..f80f26098d 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -27,7 +27,7 @@
 #include <ardour/ardour.h>
 #include <ardour/types.h>
 #include <ardour/processor.h>
-#include <ardour/automation_event.h>
+#include <ardour/automation_list.h>
 
 class XMLNode;
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index a8601a562a..fa074071c5 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -705,7 +705,7 @@ class Session : public PBD::StatefulDestructible
 	sigc::signal<void> NamedSelectionRemoved;
 
 	/* Curves and AutomationLists (TODO when they go away) */
-	void add_curve(Curve*);
+	void add_curve(Evoral::Curve*);
 	void add_automation_list(AutomationList*);
 
 	/* fade curves */
@@ -1540,7 +1540,7 @@ class Session : public PBD::StatefulDestructible
 	NamedSelection *XMLNamedSelectionFactory (const XMLNode&);
 
 	/* CURVES and AUTOMATION LISTS */
-	std::map<PBD::ID, Curve*> curves;
+	std::map<PBD::ID, Evoral::Curve*> curves;
 	std::map<PBD::ID, AutomationList*> automation_lists;
 
 	/* DEFAULT FADE CURVES */