likely fixes for problems loading templates with destructive tracks. Note that old templates with such tracks will need to be re-generated, since they are lacking information required for the session setup to succeed

git-svn-id: svn://localhost/trunk/ardour2@452 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 23 insertions, 20 deletions

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index ae3d1719c7..702d167a4f 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -243,24 +243,6 @@ AudioTrack::set_meter_point (MeterPoint p, void *src)
 	Route::set_meter_point (p, src);
 }
 
-XMLNode&
-AudioTrack::state(bool full_state)
-{
-	XMLNode& track_state (Route::state (full_state));
-	char buf[64];
-
-	/* we don't return diskstream state because we don't
-	   own the diskstream exclusively. control of the diskstream
-	   state is ceded to the Session, even if we create the
-	   diskstream.
-	*/
-
-	snprintf (buf, sizeof (buf), "%" PRIu64, diskstream->id());
-	track_state.add_property ("diskstream-id", buf);
-
-	return track_state;
-}
-
 int
 AudioTrack::set_state (const XMLNode& node)
 {
@@ -363,10 +345,22 @@ AudioTrack::set_state (const XMLNode& node)
 	return 0;
 }
 
+XMLNode&
+AudioTrack::get_template ()
+{
+	return state (false);
+}
+
+XMLNode&
+AudioTrack::get_state ()
+{
+	return state (true);
+}
+
 XMLNode& 
-AudioTrack::get_state()
+AudioTrack::state(bool full_state)
 {
-	XMLNode& root (Route::get_state());
+	XMLNode& root (Route::state(full_state));
 	XMLNode* freeze_node;
 	char buf[32];
 
@@ -441,6 +435,15 @@ AudioTrack::get_state()
 		break;
 	}
 
+	/* we don't return diskstream state because we don't
+	   own the diskstream exclusively. control of the diskstream
+	   state is ceded to the Session, even if we create the
+	   diskstream.
+	*/
+
+	snprintf (buf, sizeof (buf), "%" PRIu64, diskstream->id());
+	root.add_property ("diskstream-id", buf);
+
 	return root;
 }