MIDI region stretching.

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

libs/ardour/SConscript

@@ -84,6 +84,7 @@ midi_playlist.cc
 midi_port.cc
 midi_region.cc
 midi_source.cc
+midi_stretch.cc
 midi_track.cc
 mix.cc
 mtc_slave.cc

libs/ardour/ardour/stretch.h

@@ -22,10 +22,6 @@
 
 #include <ardour/filter.h>
 
-namespace ARDOUR {
-	class AudioRegion;
-}
-
 #ifdef USE_RUBBERBAND
 
 #include <ardour/rb_effect.h>

libs/ardour/ardour/types.h

@@ -380,6 +380,8 @@ namespace ARDOUR {
 	};
 
 	struct TimeFXRequest : public InterThreadInfo {
+		TimeFXRequest() : time_fraction(0), pitch_fraction(0),
+			quick_seek(false), antialias(false),  opts(0) {}
 	    float time_fraction;
 	    float pitch_fraction;
 	    /* SoundTouch */

libs/ardour/quantize.cc

@@ -82,89 +82,4 @@ Quantize::run (boost::shared_ptr<Region> r)
 	model->set_edited(true);
 
 	return 0;
-#if 0
-	SourceList nsrcs;
-	SourceList::iterator si;
-	nframes_t blocksize = 256 * 1024;
-	Sample* buf = 0;
-	nframes_t fpos;
-	nframes_t fstart;
-	nframes_t to_read;
-	int ret = -1;
-
-	boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(r);
-	if (!region)
-		return ret;
-
-	/* create new sources */
-
-	if (make_new_sources (region, nsrcs)) {
-		goto out;
-	}
-
-	fstart = region->start();
-
-	if (blocksize > region->length()) {
-		blocksize = region->length();
-	}
-
-	fpos = max (fstart, (fstart + region->length() - blocksize));
-	buf = new Sample[blocksize];
-	to_read = blocksize;
-
-	/* now read it backwards */
-
-	while (to_read) {
-
-		uint32_t n;
-
-		for (n = 0, si = nsrcs.begin(); n < region->n_channels(); ++n, ++si) {
-
-			/* read it in */
-			
-			if (region->audio_source (n)->read (buf, fpos, to_read) != to_read) {
-				goto out;
-			}
-
-			/* swap memory order */
-			
-			for (nframes_t i = 0; i < to_read/2; ++i) {
-				swap (buf[i],buf[to_read-1-i]);
-			}
-			
-			/* write it out */
-
-			boost::shared_ptr<AudioSource> asrc(boost::dynamic_pointer_cast<AudioSource>(*si));
-
-			if (asrc && asrc->write (buf, to_read) != to_read) {
-				goto out;
-			}
-		}
-
-		if (fpos > fstart + blocksize) {
-			fpos -= to_read;
-			to_read = blocksize;
-		} else {
-			to_read = fpos - fstart;
-			fpos = fstart;
-		}
-	};
-
-	ret = finish (region, nsrcs);
-
-  out:
-
-	if (buf) {
-		delete [] buf;
-	}
-
-	if (ret) {
-		for (si = nsrcs.begin(); si != nsrcs.end(); ++si) {
-			boost::shared_ptr<AudioSource> asrc(boost::dynamic_pointer_cast<AudioSource>(*si));
-			asrc->mark_for_remove ();
-		}
-	}
-	
-	return ret;
-#endif
 }