X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Frb_effect.cc;h=bc127e2d816f025727653ebf4e163dbe881212f7;hp=804b79f87df9e8a555adcbe56bb0a844279e5f8e;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2

diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc
index 804b79f87d..bc127e2d81 100644
--- a/libs/ardour/rb_effect.cc
+++ b/libs/ardour/rb_effect.cc
@@ -32,7 +32,7 @@
 #include "ardour/stretch.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -72,7 +72,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
 	}
 
 	SourceList nsrcs;
-	framecnt_t done;
 	int ret = -1;
 	const framecnt_t bufsize = 256;
 	gain_t* gain_buffer = 0;
@@ -80,8 +79,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
 	char suffix[32];
 	string new_name;
 	string::size_type at;
-	framepos_t pos = 0;
-	framecnt_t avail = 0;
 	boost::shared_ptr<AudioRegion> result;
 
 	cerr << "RBEffect: source region: position = " << region->position()
@@ -184,6 +181,10 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
 
 	/* create new sources */
 
+	framepos_t pos   = 0;
+	framecnt_t avail = 0;
+	framecnt_t done  = 0;
+
 	if (make_new_sources (region, nsrcs, suffix)) {
 		goto out;
 	}
@@ -201,10 +202,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
 
 	/* study first, process afterwards. */
 
-	pos = 0;
-	avail = 0;
-	done = 0;
-
 	try {
 		while (pos < read_duration && !tsr.cancel) {
 
@@ -212,8 +209,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
 
 			for (uint32_t i = 0; i < channels; ++i) {
 
-				this_read = 0;
-
 				framepos_t this_time;
 				this_time = min(bufsize, read_duration - pos);
 
@@ -254,7 +249,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
 
 			for (uint32_t i = 0; i < channels; ++i) {
 
-				this_read = 0;
 				framepos_t this_time;
 				this_time = min(bufsize, read_duration - pos);
 
@@ -358,9 +352,9 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
 					  shift);
 		(*x)->set_master_sources (region->master_sources());
 		/* multiply the old (possibly previously stretched) region length by the extra
-		   stretch this time around to get its new length
+		   stretch this time around to get its new length. this is a non-music based edit atm.
 		*/
-		(*x)->set_length ((*x)->length() * tsr.time_fraction);
+		(*x)->set_length ((*x)->length() * tsr.time_fraction, 0);
 	}
 
 	/* stretch region gain envelope */