remove destructive/tape mode tracks

13 files changed, 8 insertions, 47 deletions

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 6ee2a93c46..df0bb96755 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -51,9 +51,6 @@ public:
 		return safe_audio_file_extension(path);
 	}
 
-	/* this block of methods do nothing for regular file sources, but are significant
-	   for files used in destructive recording.
-	*/
 	virtual samplepos_t last_capture_start_sample() const { return 0; }
 	virtual void      mark_capture_start (samplepos_t) {}
 	virtual void      mark_capture_end () {}
@@ -72,7 +69,7 @@ public:
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
 
-	bool can_truncate_peaks() const { return !destructive(); }
+	bool can_truncate_peaks() const { return true; }
 	bool can_be_analysed() const    { return _length > 0; }
 
 	static bool safe_audio_file_extension (const std::string& path);
diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h
index 1ae7cbfa94..83e5dd3f9b 100644
--- a/libs/ardour/ardour/disk_io.h
+++ b/libs/ardour/ardour/disk_io.h
@@ -54,7 +54,6 @@ public:
 	enum Flag {
 		Recordable  = 0x1,
 		Hidden      = 0x2,
-		Destructive = 0x4,
 		NonLayered  = 0x8 // deprecated (kept only for enum compat)
 	};
 
diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
index fab54e2404..1d5820dbf5 100644
--- a/libs/ardour/ardour/disk_writer.h
+++ b/libs/ardour/ardour/disk_writer.h
@@ -97,8 +97,6 @@ public:
 	void set_record_enabled (bool yn);
 	void set_record_safe (bool yn);
 
-	bool destructive () const { return _flags & Destructive; }
-
 	/** @return Start position of currently-running capture (in session samples) */
 	samplepos_t current_capture_start () const { return _capture_start_sample; }
 	samplepos_t current_capture_end () const { return _capture_start_sample + _capture_captured; }
@@ -149,8 +147,6 @@ private:
 	static samplecnt_t _chunk_samples;
 
 	void prepare_record_status (samplepos_t /*capture_start_sample*/);
-	void setup_destructive_playlist ();
-	void use_destructive_playlist ();
 
 	int add_channel_to (boost::shared_ptr<ChannelList>, uint32_t how_many);
 
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index a5c4111d1c..265b2e14ee 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -66,7 +66,7 @@ public:
 
 	int set_state (const XMLNode&, int version);
 
-	int set_source_name (const std::string& newname, bool destructive);
+	int set_source_name (const std::string& newname);
 
 	static bool find (Session&, DataType type, const std::string& path,
 	                  bool must_exist, bool& is_new, uint16_t& chan,
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index dad45a4480..f70f10a774 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -262,9 +262,9 @@ public:
 	std::string construct_peak_filepath (const std::string& audio_path, const bool in_session = false, const bool old_peak_name = false) const;
 
 	bool audio_source_name_is_unique (const std::string& name);
-	std::string format_audio_source_name (const std::string& legalized_base, uint32_t nchan, uint32_t chan, bool destructive, bool take_required, uint32_t cnt, bool related_exists);
+	std::string format_audio_source_name (const std::string& legalized_base, uint32_t nchan, uint32_t chan, bool take_required, uint32_t cnt, bool related_exists);
 	std::string new_audio_source_path_for_embedded (const std::string& existing_path);
-	std::string new_audio_source_path (const std::string&, uint32_t nchans, uint32_t chan, bool destructive, bool take_required);
+	std::string new_audio_source_path (const std::string&, uint32_t nchans, uint32_t chan, bool take_required);
 	std::string new_midi_source_path (const std::string&, bool need_source_lock = true);
 
 	/** create a new track or bus from a template (XML path)
@@ -841,7 +841,7 @@ public:
 	static PBD::Signal0<int> AskAboutPendingState;
 
 	boost::shared_ptr<AudioFileSource> create_audio_source_for_session (
-		size_t, std::string const &, uint32_t, bool destructive);
+		size_t, std::string const &, uint32_t);
 
 	boost::shared_ptr<MidiSource> create_midi_source_for_session (std::string const &);
 	boost::shared_ptr<MidiSource> create_midi_source_by_stealing_name (boost::shared_ptr<Track>);
@@ -1761,8 +1761,6 @@ private:
 	bool _reconnecting_routes_in_progress;
 	bool _route_deletion_in_progress;
 
-	uint32_t destructive_index;
-
 	boost::shared_ptr<Route> XMLRouteFactory (const XMLNode&, int);
 	boost::shared_ptr<Route> XMLRouteFactory_2X (const XMLNode&, int);
 	boost::shared_ptr<Route> XMLRouteFactory_3X (const XMLNode&, int);
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index b481ef2f4a..3fa5a9776b 100644
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -28,7 +28,6 @@
     the value of the variable.
 *****************************************************/
 
-CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs,  "destructive-xfade-msecs", 2)
 CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true)
 CONFIG_VARIABLE (bool, use_transport_fades, "use-transport-fades", true)
 CONFIG_VARIABLE (bool, use_monitor_fades, "use-monitor-fades", true)
diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h
index 3be92bbf84..f0a32dc22f 100644
--- a/libs/ardour/ardour/silentfilesource.h
+++ b/libs/ardour/ardour/silentfilesource.h
@@ -37,7 +37,6 @@ public:
 	void set_length (samplecnt_t len) { _length = len; }
 	void flush () {}
 
-	bool destructive() const { return false; }
 	bool can_be_analysed() const { return false; }
 
 	bool clamped_at_unity() const { return false; }
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index a63f222f8a..be14e758c3 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -65,17 +65,11 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	int flush_header ();
 	void flush ();
 
-	samplepos_t last_capture_start_sample() const;
-	void mark_capture_start (samplepos_t);
-	void mark_capture_end ();
-	void clear_capture_marks();
-
 	bool one_of_several_channels () const;
-    uint32_t channel_count () const { return _info.channels; }
+	uint32_t channel_count () const { return _info.channels; }
 
 	bool clamped_at_unity () const;
 
-	static void setup_standard_crossfades (Session const &, samplecnt_t sample_rate);
 	static const Source::Flag default_writable_flags;
 
 	static int get_soundfile_info (const std::string& path, SoundFileInfo& _info, std::string& error_msg);
@@ -100,24 +94,8 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	int setup_broadcast_info (samplepos_t when, struct tm&, time_t);
 	void file_closed ();
 
-	/* destructive */
-
-	static samplecnt_t xfade_samples;
-
-	static gain_t* out_coefficient;
-	static gain_t* in_coefficient;
-
-	bool           _capture_start;
-	bool           _capture_end;
-	samplepos_t    capture_start_sample;
-	samplepos_t    file_pos; // unit is samples
-	Sample*        xfade_buf;
-
-	samplecnt_t crossfade (Sample* data, samplecnt_t cnt, int dir);
 	void set_natural_position (samplepos_t);
-	samplecnt_t destructive_write_unlocked (Sample *dst, samplecnt_t cnt);
 	samplecnt_t nondestructive_write_unlocked (Sample *dst, samplecnt_t cnt);
-	void handle_header_position_change ();
 	PBD::ScopedConnection header_position_connection;
 };
 
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 9604062b8e..e8dadf57bd 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -53,7 +53,7 @@ public:
 		RemovableIfEmpty = 0x10,
 		RemoveAtDestroy = 0x20,
 		NoPeakFile = 0x40,
-		Destructive = 0x80,
+		/* 0x80 was Destructive */
 		Empty = 0x100, /* used for MIDI only */
 		RF64_RIFF = 0x200,
 		Missing = 0x400, /* used for MIDI only */
@@ -88,7 +88,6 @@ public:
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
 
-	bool         destructive() const       { return (_flags & Destructive); }
 	bool         writable () const;
 
 	virtual bool length_mutable() const    { return false; }
diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index a85cb634ca..21a2d8a988 100644
--- a/libs/ardour/ardour/source_factory.h
+++ b/libs/ardour/ardour/source_factory.h
@@ -54,7 +54,7 @@ class LIBARDOUR_API SourceFactory {
 	static boost::shared_ptr<Source> createWritable
 		(DataType type, Session&,
 		 const std::string& path,
-		 bool destructive, samplecnt_t rate, bool announce = true, bool async = false);
+		 samplecnt_t rate, bool announce = true, bool async = false);
 
 
 	static boost::shared_ptr<Source> createForRecovery
diff --git a/libs/ardour/ardour/srcfilesource.h b/libs/ardour/ardour/srcfilesource.h
index 241703c0b3..c110ac634a 100644
--- a/libs/ardour/ardour/srcfilesource.h
+++ b/libs/ardour/ardour/srcfilesource.h
@@ -46,7 +46,6 @@ public:
 	samplecnt_t readable_length() const { return _source->readable_length() * _ratio; }
 	samplecnt_t length (samplepos_t pos) const { return _source->length(pos) * _ratio; }
 
-	bool destructive() const { return false; }
 	bool can_be_analysed() const { return false; }
 	bool clamped_at_unity() const { return false; }
 
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 2ab9b8ef9a..3d92811d13 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -129,7 +129,6 @@ public:
 	boost::shared_ptr<Playlist> playlist ();
 	void request_input_monitoring (bool);
 	void ensure_input_monitoring (bool);
-	bool destructive () const;
 	std::list<boost::shared_ptr<Source> > & last_capture_sources ();
 	std::string steal_write_source_name ();
 	void reset_write_sources (bool, bool force = false);
@@ -208,7 +207,6 @@ protected:
 
 	FreezeRecord _freeze_record;
 	XMLNode*      pending_state;
-	bool         _destructive;
 
 	boost::shared_ptr<AutomationControl> _record_enable_control;
 	boost::shared_ptr<AutomationControl> _record_safe_control;
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index b55e245282..60943c1d28 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -227,7 +227,6 @@ enum MeterType {
 enum TrackMode {
 	Normal,
 	NonLayered,
-	Destructive
 };
 
 enum NoteMode {