7 files changed, 15 insertions, 16 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h
index 1b60cf185d..5a77067f8f 100644
--- a/libs/ardour/ardour/audioplaylist.h
+++ b/libs/ardour/ardour/audioplaylist.h
@@ -77,9 +77,6 @@ class AudioPlaylist : public ARDOUR::Playlist
 
 	bool destroy_region (Region*);
 
-	void get_equivalent_regions (const AudioRegion&, std::vector<AudioRegion*>&);
-	void get_region_list_equivalent_regions (const AudioRegion&, std::vector<AudioRegion*>&);
-
 	void drop_all_states ();
 
     protected:
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 009aa4b5b0..f3d34eb262 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -75,11 +75,7 @@ class AudioRegion : public Region
 	AudioRegion (SourceList &, const XMLNode&);
 	~AudioRegion();
 
-	bool region_list_equivalent (const AudioRegion&) const ;
-	bool source_equivalent (const AudioRegion&) const;
-	bool equivalent (const AudioRegion&) const;
-	bool size_equivalent (const AudioRegion&) const;
-	bool overlap_equivalent (const AudioRegion&) const;
+	bool source_equivalent (const Region&) const;
 
 	bool speed_mismatch (float) const;
 
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index f696295b58..6cff58eef8 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -81,6 +81,8 @@ class IO : public Stateful, public ARDOUR::StateManager
 	void set_output_minimum (int n);
 	void set_output_maximum (int n);
 
+	Buffer::Type default_type() const { return _default_type; }
+
 	const string& name() const { return _name; }
 	virtual int set_name (string str, void *src);
 	
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index e4d8f48c6e..1371162b14 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -59,11 +59,7 @@ class MidiRegion : public Region
 	MidiRegion (SourceList &, const XMLNode&);
 	~MidiRegion();
 
-	bool region_list_equivalent (const MidiRegion&) const ;
-	bool source_equivalent (const MidiRegion&) const;
-	bool equivalent (const MidiRegion&) const;
-	bool size_equivalent (const MidiRegion&) const;
-	bool overlap_equivalent (const MidiRegion&) const;
+	bool source_equivalent (const Region&) const;
 
 	bool speed_mismatch (float) const;
 
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 69b6a1fbc3..ca760a5ad5 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -81,6 +81,8 @@ class Playlist : public Stateful, public StateManager {
 
 	void add_region (const Region&, jack_nframes_t position, float times = 1, bool with_save = true);
 	void remove_region (Region *);
+	void get_equivalent_regions (const Region&, std::vector<Region*>&);
+	void get_region_list_equivalent_regions (const Region&, std::vector<Region*>&);
 	void replace_region (Region& old, Region& newr, jack_nframes_t pos);
 	void split_region (Region&, jack_nframes_t position);
 	void partition (jack_nframes_t start, jack_nframes_t end, bool just_top_level);
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index d58f98adca..68ac55df67 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -121,7 +121,7 @@ class Region : public Stateful, public StateManager
 	bool hidden() const { return _flags & Hidden; }
 	bool muted() const { return _flags & Muted; }
 	bool opaque () const { return _flags & Opaque; }
-	bool envelope_active () const { return _flags & EnvelopeActive; }
+	//bool envelope_active () const { return _flags & EnvelopeActive; }
 	bool locked() const { return _flags & Locked; }
 	bool automatic() const { return  _flags & Automatic; }
 	bool whole_file() const { return _flags & WholeFile ; }
@@ -139,6 +139,12 @@ class Region : public Stateful, public StateManager
 	OverlapType coverage (jack_nframes_t start, jack_nframes_t end) const {
 		return ARDOUR::coverage (_position, _position + _length - 1, start, end);
 	}
+	
+	bool equivalent (const Region&) const;
+	bool size_equivalent (const Region&) const;
+	bool overlap_equivalent (const Region&) const;
+	bool region_list_equivalent (const Region&) const;
+	virtual bool source_equivalent (const Region&) const = 0;
 
 	/*virtual jack_nframes_t read_at (Sample *buf, Sample *mixdown_buffer, 
 					float *gain_buffer, char * workbuf, jack_nframes_t position, jack_nframes_t cnt, 
@@ -173,7 +179,7 @@ class Region : public Stateful, public StateManager
 	void set_hidden (bool yn);
 	void set_muted (bool yn);
 	void set_opaque (bool yn);
-	void set_envelope_active (bool yn);
+	//void set_envelope_active (bool yn);
 	void set_locked (bool yn);
 
 	virtual uint32_t read_data_count() const { return _read_data_count; }
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 3b1a0bef99..10cb554842 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -636,7 +636,7 @@ class Session : public sigc::trackable, public Stateful
 	string path_from_region_name (string name, string identifier);
 
 	AudioRegion* find_whole_file_parent (AudioRegion&);
-	void find_equivalent_playlist_regions (AudioRegion&, std::vector<AudioRegion*>& result);
+	void find_equivalent_playlist_regions (Region&, std::vector<Region*>& result);
 
 	AudioRegion *XMLRegionFactory (const XMLNode&, bool full);