8 files changed, 16 insertions, 1 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index 21a1789468..a0799aabde 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -74,9 +74,11 @@ 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 d80042a252..28e42cd4f3 100644
--- a/libs/ardour/ardour/audio_track.h
+++ b/libs/ardour/ardour/audio_track.h
@@ -37,8 +37,10 @@ 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 e51f8c3ef1..404aceec5e 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -109,13 +109,15 @@ 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; }
-	bool           non_layered()  const { return _flags & NonLayered; }
+	bool           non_layered() const;  // { return _flags & NonLayered; }
 	bool           reversed()    const { return _actual_speed < 0.0f; }
 	double         speed()       const { return _visible_speed; }
 
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 45f01763d8..4f91a30ca9 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -91,7 +91,9 @@ 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);
 
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index 6c4bc3fb54..6e7ab3a279 100644
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -36,6 +36,7 @@ CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
 CONFIG_VARIABLE (bool, auto_input, "auto-input", true)
 CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
 CONFIG_VARIABLE (bool, punch_out, "punch-out", false)
+CONFIG_VARIABLE (bool, layered_record_mode, "layered-record-mode", false)
 CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100)
 CONFIG_VARIABLE (Timecode::TimecodeFormat, timecode_format, "timecode-format", Timecode::timecode_30)
 CONFIG_VARIABLE_SPECIAL(std::string, raid_path, "raid-path", "", PBD::path_expand)
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 5aa11814fb..850a32a557 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -67,7 +67,9 @@ 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 eb204715a1..71595592fb 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -82,7 +82,9 @@ 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 243d40faf0..65f38e6fc0 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -56,9 +56,11 @@ 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; }