fix up mess with unassigned Playlist::orig_track_id

git-svn-id: svn://localhost/ardour2/branches/3.0@10998 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 5 insertions, 4 deletions

diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index f52148bebc..4ae5b59fc8 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -42,7 +42,7 @@ class AudioTrack : public Track
 	int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 	          int declick, bool& need_butler);
 
-	void use_new_diskstream ();
+	boost::shared_ptr<Diskstream> create_diskstream ();
 	void set_diskstream (boost::shared_ptr<Diskstream>);
 
 	DataType data_type () const {
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 0df9f538f3..1f2f11b5bc 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -46,7 +46,7 @@ public:
 	void realtime_handle_transport_stopped ();
 	void realtime_locate ();
 
-	void use_new_diskstream ();
+	boost::shared_ptr<Diskstream> create_diskstream ();
 	void set_diskstream (boost::shared_ptr<Diskstream>);
 	void set_record_enabled (bool yn, void *src);
 
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 529ec25d14..cce602437b 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -202,7 +202,7 @@ public:
 	void lower_region_to_bottom (boost::shared_ptr<Region>);
 
 	const PBD::ID& get_orig_track_id () const { return _orig_track_id; }
-	void set_orig_track_id (const PBD::ID& did) { _orig_track_id = did; }
+	void set_orig_track_id (const PBD::ID& did);
 
 	/* destructive editing */
 
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 496b1e195b..f0492401d9 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -69,7 +69,8 @@ class Track : public Route, public PublicDiskstream
 
 	bool can_record();
 
-	virtual void use_new_diskstream () = 0;
+	void use_new_diskstream ();
+	virtual boost::shared_ptr<Diskstream> create_diskstream() = 0;
 	virtual void set_diskstream (boost::shared_ptr<Diskstream>);
 
 	void set_latency_compensation (framecnt_t);