7 files changed, 1 insertions, 31 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index a0799aabde..21541c6fb8 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -74,11 +74,6 @@ class LIBARDOUR_API AudioDiskstream : public Diskstream
 
 	void set_record_enabled (bool yn);
 	void set_record_safe (bool yn);
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	int set_destructive (bool yn);
-	int set_non_layered (bool yn);
-	bool can_become_destructive (bool& requires_bounce) const;
-#endif
 
 	boost::shared_ptr<AudioPlaylist> audio_playlist () { return boost::dynamic_pointer_cast<AudioPlaylist>(_playlist); }
 
diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h
index 28e42cd4f3..7103825daf 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -37,11 +37,6 @@ class LIBARDOUR_API AudioTrack : public Track
 	AudioTrack (Session&, std::string name, TrackMode m = Normal);
 	~AudioTrack ();
 
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	int set_mode (TrackMode m);
-	bool can_use_mode (TrackMode m, bool& bounce_required);
-#endif
-
 	int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 	          int declick, bool& need_butler);
 
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 404aceec5e..ea8e44a0ad 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -109,11 +109,6 @@ class LIBARDOUR_API Diskstream : public SessionObject, public PublicDiskstream
 	virtual void set_record_safe (bool yn) = 0;
 
 	bool destructive() const { return _flags & Destructive; }
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	virtual int set_destructive (bool /*yn*/) { return -1; }
-	virtual int set_non_layered (bool /*yn*/) { return -1; }
-	virtual	bool can_become_destructive (bool& /*requires_bounce*/) const { return false; }
-#endif
 
 	bool           hidden()      const { return _flags & Hidden; }
 	bool           recordable()  const { return _flags & Recordable; }
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 4f91a30ca9..ff66222d02 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -91,10 +91,6 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
 
 	boost::shared_ptr<SMFSource> write_source ()    { return _write_source; }
 
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	int set_destructive (bool yn); // doom!
-#endif
-
 	void set_note_mode (NoteMode m);
 
 	/** Emitted when some MIDI data has been received for recording.
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 850a32a557..0130765123 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -67,10 +67,6 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource {
 	void mark_capture_end ();
 	void clear_capture_marks();
 
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	bool set_destructive (bool yn);
-#endif
-
 	bool one_of_several_channels () const;
     uint32_t channel_count () const { return _info.channels; }
 
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 71595592fb..275fe7c11a 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -82,9 +82,7 @@ class LIBARDOUR_API Source : public SessionObject
 
 	bool         destructive() const       { return (_flags & Destructive); }
 	bool         writable () const;
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	virtual bool set_destructive (bool /*yn*/) { return false; }
-#endif
+
 	virtual bool length_mutable() const    { return false; }
 
 	static PBD::Signal1<void,Source*>             SourceCreated;
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index a347bdf887..b67e9d970a 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -58,11 +58,6 @@ class LIBARDOUR_API Track : public Route, public Recordable, public PublicDiskst
 	void resync_track_name ();
 
 	TrackMode mode () const { return _mode; }
-#ifdef XXX_OLD_DESTRUCTIVE_API_XXX
-	virtual int set_mode (TrackMode /*m*/) { return false; }
-	virtual bool can_use_mode (TrackMode /*m*/, bool& /*bounce_required*/) { return false; }
-	PBD::Signal0<void> TrackModeChanged;
-#endif
 
 	boost::shared_ptr<MonitorControl> monitoring_control() const { return _monitoring_control; }