X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Freverse.cc;h=a35858ce97b146ff2ae06a7fab73683910463151;hb=33da74c8e353ac56194956cae8e2b7d74ec1a1b0;hp=15f90fec457810c93375545fc11c5e3447bff09c;hpb=82232f06ba3eea4a2b4342ad91fab552f4044402;p=ardour.git

diff --git a/libs/ardour/reverse.cc b/libs/ardour/reverse.cc
index 15f90fec45..a35858ce97 100644
--- a/libs/ardour/reverse.cc
+++ b/libs/ardour/reverse.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,18 +15,17 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
 
-#include <pbd/basename.h>
+#include "pbd/basename.h"
 
-#include <ardour/types.h>
-#include <ardour/reverse.h>
-#include <ardour/audiofilesource.h>
-#include <ardour/session.h>
-#include <ardour/audioregion.h>
+#include "ardour/types.h"
+#include "ardour/reverse.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/session.h"
+#include "ardour/audioregion.h"
 
 #include "i18n.h"
 
@@ -34,7 +33,7 @@ using namespace std;
 using namespace ARDOUR;
 
 Reverse::Reverse (Session& s)
-	: AudioFilter (s)
+	: Filter (s)
 {
 }
 
@@ -43,55 +42,58 @@ Reverse::~Reverse ()
 }
 
 int
-Reverse::run (boost::shared_ptr<AudioRegion> region)
+Reverse::run (boost::shared_ptr<Region> r)
 {
 	SourceList nsrcs;
 	SourceList::iterator si;
-	const jack_nframes_t blocksize = 256 * 1048;
-	Sample buf[blocksize];
-	jack_nframes_t fpos;
-	jack_nframes_t fend;
-	jack_nframes_t fstart;
-	jack_nframes_t to_read;
+	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;
 	}
 
-	fend = region->start() + region->length();
 	fstart = region->start();
 
-	if (blocksize < fend) {
-		fpos =max(fstart, fend - blocksize);
-	} else {
-		fpos = fstart;
+	if (blocksize > region->length()) {
+		blocksize = region->length();
 	}
 
-	to_read = min (region->length(), blocksize);
+	fpos = max (fstart, (fstart + region->length() - blocksize));
+
+	buf = new Sample[blocksize];
+	to_read = blocksize;
 
 	/* now read it backwards */
 
-	while (1) {
+	while (to_read) {
 
 		uint32_t n;
 
 		for (n = 0, si = nsrcs.begin(); n < region->n_channels(); ++n, ++si) {
 
-			/* read it in */
-			
+			/* read it in directly from the source */
+
 			if (region->audio_source (n)->read (buf, fpos, to_read) != to_read) {
 				goto out;
 			}
-			
+
 			/* swap memory order */
-			
-			for (jack_nframes_t i = 0; i < to_read/2; ++i) {
+
+			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));
@@ -101,13 +103,11 @@ Reverse::run (boost::shared_ptr<AudioRegion> region)
 			}
 		}
 
-		if (fpos == fstart) {
-			break;
-		} else if (fpos > fstart + to_read) {
+		if (fpos > fstart + blocksize) {
 			fpos -= to_read;
-			to_read = min (fstart - fpos, blocksize);
+			to_read = blocksize;
 		} else {
-			to_read = fpos-fstart;
+			to_read = fpos - fstart;
 			fpos = fstart;
 		}
 	};
@@ -116,12 +116,14 @@ Reverse::run (boost::shared_ptr<AudioRegion> region)
 
   out:
 
+	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;
 }