X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Freverse.cc;h=45d7c83051d7a54954ba37087d6d93179ee27700;hb=c99738d88e8a2ad806b219b9f3614a6b55b6bf37;hp=02ec2924b00025369100eb280d1135c808f5bebb;hpb=f68caf23ddd0bfe5c189b94f0f57b194c1e2d912;p=ardour.git

diff --git a/libs/ardour/reverse.cc b/libs/ardour/reverse.cc
index 02ec2924b0..45d7c83051 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
@@ -19,13 +19,13 @@
 
 #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"
 
@@ -42,15 +42,15 @@ Reverse::~Reverse ()
 }
 
 int
-Reverse::run (boost::shared_ptr<Region> r)
+Reverse::run (boost::shared_ptr<Region> r, Progress*)
 {
 	SourceList nsrcs;
 	SourceList::iterator si;
-	nframes_t blocksize = 256 * 1024;
+	framecnt_t blocksize = 256 * 1024;
 	Sample* buf = 0;
-	nframes_t fpos;
-	nframes_t fstart;
-	nframes_t to_read;
+	framepos_t fpos;
+	framepos_t fstart;
+	framecnt_t to_read;
 	int ret = -1;
 
 	boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(r);
@@ -70,6 +70,7 @@ Reverse::run (boost::shared_ptr<Region> r)
 	}
 
 	fpos = max (fstart, (fstart + region->length() - blocksize));
+
 	buf = new Sample[blocksize];
 	to_read = blocksize;
 
@@ -81,18 +82,18 @@ Reverse::run (boost::shared_ptr<Region> r)
 
 		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 (nframes_t i = 0; i < to_read/2; ++i) {
+
+			for (framecnt_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));
@@ -115,9 +116,7 @@ Reverse::run (boost::shared_ptr<Region> r)
 
   out:
 
-	if (buf) {
-		delete [] buf;
-	}
+	delete [] buf;
 
 	if (ret) {
 		for (si = nsrcs.begin(); si != nsrcs.end(); ++si) {
@@ -125,6 +124,6 @@ Reverse::run (boost::shared_ptr<Region> r)
 			asrc->mark_for_remove ();
 		}
 	}
-	
+
 	return ret;
 }