10 files changed, 61 insertions, 11 deletions
diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h
index 923967448c..7ede9f019a 100644
--- a/libs/ardour/ardour/automation_list.h
+++ b/libs/ardour/ardour/automation_list.h
@@ -85,6 +85,7 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL
 	XMLNode& serialize_events ();
 
   private:
+	void create_curve_if_necessary ();
 	int deserialize_events (const XMLNode&);
 	
 	void maybe_signal_changed ();
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 23155c7ab1..b42699d964 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -703,7 +703,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 	sigc::signal<void> NamedSelectionRemoved;
 
 	/* Curves and AutomationLists (TODO when they go away) */
-	void add_curve(Evoral::Curve*);
 	void add_automation_list(AutomationList*);
 
 	/* fade curves */
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 104815b9dc..df648bc055 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -24,6 +24,8 @@
 #include <pbd/error.h>
 #include <pbd/enumwriter.h>
 
+#include <evoral/Curve.hpp>
+
 #include <ardour/audio_track.h>
 #include <ardour/audio_diskstream.h>
 #include <ardour/session.h>
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 1559827b42..e48f2ae586 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -35,6 +35,8 @@
 #include <pbd/enumwriter.h>
 #include <pbd/convert.h>
 
+#include <evoral/Curve.hpp>
+
 #include <ardour/audioregion.h>
 #include <ardour/session.h>
 #include <ardour/gain.h>
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 0066e71c3c..7493df26ac 100644
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -50,7 +50,6 @@ static void dumpit (const AutomationList& al, string prefix = "")
 }
 #endif
 
-/* XXX: min_val max_val redundant? (param.min() param.max()) */
 AutomationList::AutomationList (Evoral::Parameter id)
 	: ControlList(id)
 {
@@ -58,6 +57,8 @@ AutomationList::AutomationList (Evoral::Parameter id)
 	_style = Absolute;
 	_touching = false;
 
+	create_curve_if_necessary();
+
 	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
 }
@@ -69,6 +70,8 @@ AutomationList::AutomationList (const AutomationList& other)
 	_state = other._state;
 	_touching = other._touching;
 	
+	create_curve_if_necessary();
+	
 	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
 }
@@ -79,6 +82,8 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl
 	_style = other._style;
 	_state = other._state;
 	_touching = other._touching;
+	
+	create_curve_if_necessary();
 
 	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
@@ -96,8 +101,11 @@ AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id)
 	
 	set_state (node);
 
-	if (id)
+	if (id) {
 		_parameter = id;
+	}
+	
+	create_curve_if_necessary();
 
 	assert(_parameter.type() != NullAutomation);
 	AutomationListCreated(this);
@@ -114,6 +122,22 @@ AutomationList::create(Evoral::Parameter id)
 	return boost::shared_ptr<Evoral::ControlList>(new AutomationList(id));
 }
 
+void
+AutomationList::create_curve_if_necessary()
+{
+	switch (_parameter.type()) {
+	case GainAutomation:
+	case PanAutomation:
+	case FadeInAutomation:
+	case FadeOutAutomation:
+	case EnvelopeAutomation:
+		create_curve();
+		break;
+	default:
+		break;
+	}
+}
+
 bool
 AutomationList::operator== (const AutomationList& other)
 {
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index b7dfd79068..0bd40d9e45 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -37,6 +37,8 @@
 #include <pbd/xml++.h>
 #include <pbd/enumwriter.h>
 
+#include <evoral/Curve.hpp>
+
 #include <ardour/session.h>
 #include <ardour/panner.h>
 #include <ardour/utils.h>
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index ea2a472495..a80ceb70ef 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -27,6 +27,8 @@
 #include <pbd/stacktrace.h>
 #include <pbd/memento_command.h>
 
+#include <evoral/Curve.hpp>
+
 #include <ardour/timestamps.h>
 #include <ardour/audioengine.h>
 #include <ardour/route.h>
diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index bb51d51c43..bedbe7211f 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -35,6 +35,7 @@
 #include <pbd/id.h>
 #include <pbd/statefuldestructible.h>
 #include <pbd/failed_constructor.h>
+#include <evoral/Curve.hpp>
 
 using namespace PBD;
 using namespace ARDOUR;
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp
index 70488b60be..c9f791ec17 100644
--- a/libs/evoral/evoral/ControlList.hpp
+++ b/libs/evoral/evoral/ControlList.hpp
@@ -25,10 +25,10 @@
 #include <glibmm/thread.h>
 #include "evoral/types.hpp"
 #include "evoral/Parameter.hpp"
-#include "evoral/Curve.hpp"
 
 namespace Evoral {
 
+class Curve;
 
 /** A single event (time-stamped value) for a control
  */
@@ -216,8 +216,11 @@ public:
 	bool rt_safe_earliest_event (double start, double end, double& x, double& y, bool start_inclusive=false) const;
 	bool rt_safe_earliest_event_unlocked (double start, double end, double& x, double& y, bool start_inclusive=false) const;
 
-	Curve&       curve()       { return *_curve; }
-	const Curve& curve() const { return *_curve; }
+	void create_curve();
+	void destroy_curve();
+
+	Curve&       curve()       { assert(_curve); return *_curve; }
+	const Curve& curve() const { assert(_curve); return *_curve; }
 	
 	virtual void mark_dirty () const;
 
diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index 0677c622ee..dee0242143 100644
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -21,6 +21,7 @@
 #include <utility>
 #include <iostream>
 #include "evoral/ControlList.hpp"
+#include "evoral/Curve.hpp"
 
 using namespace std;
 
@@ -36,7 +37,7 @@ inline bool event_time_less_than (ControlEvent* a, ControlEvent* b)
 ControlList::ControlList (const Parameter& id)
 	: _parameter(id)
 	, _interpolation(Linear)
-	, _curve(new Curve(*this))
+	, _curve(0)
 {	
 	_frozen = 0;
 	_changed_when_thawed = false;
@@ -54,7 +55,7 @@ ControlList::ControlList (const Parameter& id)
 ControlList::ControlList (const ControlList& other)
 	: _parameter(other._parameter)
 	, _interpolation(Linear)
-	, _curve(new Curve(*this))
+	, _curve(0)
 {
 	_frozen = 0;
 	_changed_when_thawed = false;
@@ -70,14 +71,14 @@ ControlList::ControlList (const ControlList& other)
 	for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
 		_events.push_back (new ControlEvent (**i));
 	}
-
+	
 	mark_dirty ();
 }
 
 ControlList::ControlList (const ControlList& other, double start, double end)
 	: _parameter(other._parameter)
 	, _interpolation(Linear)
-	, _curve(new Curve(*this))
+	, _curve(0)
 {
 	_frozen = 0;
 	_changed_when_thawed = false;
@@ -99,7 +100,7 @@ ControlList::ControlList (const ControlList& other, double start, double end)
 			_events.push_back (new ControlEvent ((*i)->when, (*i)->value));
 		}
 	}
-
+	
 	mark_dirty ();
 }
 
@@ -148,6 +149,19 @@ ControlList::operator= (const ControlList& other)
 }
 
 void
+ControlList::create_curve()
+{
+	_curve = new Curve(*this);
+}
+
+void
+ControlList::destroy_curve()
+{
+	delete _curve;
+	_curve = NULL;
+}
+
+void
 ControlList::maybe_signal_changed ()
 {
 	mark_dirty ();