Heavy-duty abstraction work to split type-specific classes into

specializations of (new, for the most part) generic bases.  (eg. most everything
from the MIDI branch except for actual MIDI things, so merges have a chance of
succeeding).  Also the new edit toolbar, and various other cleanup things I did
along the way.

Should be functionally equivalent (except the toolbar), this is just design work.

She's a big'un....



git-svn-id: svn://localhost/ardour2/trunk@727 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 35 deletions

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 85c11647f4..93d380679d 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -243,16 +243,18 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, ch
 
 	for (vector<uint32_t>::iterator l = relevant_layers.begin(); l != relevant_layers.end(); ++l) {
 
+		// FIXME: Should be vector<AudioRegion*>
 		vector<Region*>& r (relevant_regions[*l]);
 		vector<Crossfade*>& x (relevant_xfades[*l]);
 
 		for (vector<Region*>::iterator i = r.begin(); i != r.end(); ++i) {
-			(*i)->read_at (buf, mixdown_buffer, gain_buffer, workbuf, start, cnt, chan_n, read_frames, skip_frames);
-			_read_data_count += (*i)->read_data_count();
+			AudioRegion* const ar = dynamic_cast<AudioRegion*>(*i);
+			assert(ar);
+			ar->read_at (buf, mixdown_buffer, gain_buffer, workbuf, start, cnt, chan_n, read_frames, skip_frames);
+			_read_data_count += ar->read_data_count();
 		}
 		
 		for (vector<Crossfade*>::iterator i = x.begin(); i != x.end(); ++i) {
-			
 			(*i)->read_at (buf, mixdown_buffer, gain_buffer, workbuf, start, cnt, chan_n);
 
 			/* don't JACK up _read_data_count, since its the same data as we just
@@ -880,38 +882,6 @@ AudioPlaylist::crossfade_changed (Change ignored)
 	notify_modified ();
 }
 
-void
-AudioPlaylist::get_equivalent_regions (const AudioRegion& other, vector<AudioRegion*>& results)
-{
-	for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-
-		AudioRegion* ar = dynamic_cast<AudioRegion*> (*i);
-
-		if (ar) {
-			if (Config->get_use_overlap_equivalency()) {
-				if (ar->overlap_equivalent (other)) {
-					results.push_back (ar);
-				} else if (ar->equivalent (other)) {
-					results.push_back (ar);
-				}
-			}
-		}
-	}
-}
-
-void
-AudioPlaylist::get_region_list_equivalent_regions (const AudioRegion& other, vector<AudioRegion*>& results)
-{
-	for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-
-		AudioRegion* ar = dynamic_cast<AudioRegion*> (*i);
-		
-		if (ar && ar->region_list_equivalent (other)) {
-			results.push_back (ar);
-		}
-	}
-}
-
 bool
 AudioPlaylist::region_changed (Change what_changed, Region* region)
 {