X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Freverse.cc;h=b2189cf67e5c3a184224398fd57ff8b5a708be62;hb=6e94b1fb9f79c5bfcf22cd5b88619afa9bedb1b2;hp=6d838bf9120558f739645a21eeb308a050b09100;hpb=4e1f451520975868659f4c00d00883f5f1cd5805;p=ardour.git

diff --git a/libs/ardour/reverse.cc b/libs/ardour/reverse.cc
index 6d838bf912..b2189cf67e 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,19 +19,16 @@
 
 #include <algorithm>
 
-#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 "i18n.h"
+#include "ardour/audioregion.h"
+#include "ardour/audiosource.h"
+#include "ardour/reverse.h"
+#include "ardour/types.h"
 
 using namespace std;
 using namespace ARDOUR;
 
+namespace ARDOUR { class Progress; class Session; }
+
 Reverse::Reverse (Session& s)
 	: Filter (s)
 {
@@ -42,15 +39,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);
@@ -59,7 +56,7 @@ Reverse::run (boost::shared_ptr<Region> r)
 
 	/* create new sources */
 
-	if (make_new_sources (region, nsrcs)) {
+	if (make_new_sources (region, nsrcs, "", false)) {
 		goto out;
 	}
 
@@ -83,14 +80,14 @@ Reverse::run (boost::shared_ptr<Region> r)
 		for (n = 0, si = nsrcs.begin(); n < region->n_channels(); ++n, ++si) {
 
 			/* 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]);
 			}
 
@@ -124,6 +121,6 @@ Reverse::run (boost::shared_ptr<Region> r)
 			asrc->mark_for_remove ();
 		}
 	}
-	
+
 	return ret;
 }