projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tempo ramps - audio-locked meters have a bbt of 1|1|0
[ardour.git]
/
libs
/
ardour
/
rb_effect.cc
diff --git
a/libs/ardour/rb_effect.cc
b/libs/ardour/rb_effect.cc
index 7ff60e6912f0976f0369c462b8989c62d83b8e55..03ce918f3142817ffd72508b2d18074a7cb8c457 100644
(file)
--- a/
libs/ardour/rb_effect.cc
+++ b/
libs/ardour/rb_effect.cc
@@
-20,8
+20,9
@@
#include <algorithm>
#include <cmath>
#include <algorithm>
#include <cmath>
+#include <rubberband/RubberBandStretcher.h>
+
#include "pbd/error.h"
#include "pbd/error.h"
-#include "rubberband/RubberBandStretcher.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
@@
-71,7
+72,6
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
}
SourceList nsrcs;
}
SourceList nsrcs;
- framecnt_t done;
int ret = -1;
const framecnt_t bufsize = 256;
gain_t* gain_buffer = 0;
int ret = -1;
const framecnt_t bufsize = 256;
gain_t* gain_buffer = 0;
@@
-79,8
+79,6
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
char suffix[32];
string new_name;
string::size_type at;
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()
boost::shared_ptr<AudioRegion> result;
cerr << "RBEffect: source region: position = " << region->position()
@@
-183,6
+181,10
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
/* create new sources */
/* create new sources */
+ framepos_t pos = 0;
+ framecnt_t avail = 0;
+ framecnt_t done = 0;
+
if (make_new_sources (region, nsrcs, suffix)) {
goto out;
}
if (make_new_sources (region, nsrcs, suffix)) {
goto out;
}
@@
-200,10
+202,6
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
/* study first, process afterwards. */
/* study first, process afterwards. */
- pos = 0;
- avail = 0;
- done = 0;
-
try {
while (pos < read_duration && !tsr.cancel) {
try {
while (pos < read_duration && !tsr.cancel) {
@@
-211,8
+209,6
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
for (uint32_t i = 0; i < channels; ++i) {
for (uint32_t i = 0; i < channels; ++i) {
- this_read = 0;
-
framepos_t this_time;
this_time = min(bufsize, read_duration - pos);
framepos_t this_time;
this_time = min(bufsize, read_duration - pos);
@@
-253,7
+249,6
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
for (uint32_t i = 0; i < channels; ++i) {
for (uint32_t i = 0; i < channels; ++i) {
- this_read = 0;
framepos_t this_time;
this_time = min(bufsize, read_duration - pos);
framepos_t this_time;
this_time = min(bufsize, read_duration - pos);
@@
-329,7
+324,7
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
}
} catch (runtime_error& err) {
}
} catch (runtime_error& err) {
- error <<
_("timefx code failure. please notify ardour-developers."
) << endmsg;
+ error <<
string_compose (_("programming error: %1"), X_("timefx code failure")
) << endmsg;
error << err.what() << endmsg;
goto out;
}
error << err.what() << endmsg;
goto out;
}
@@
-388,8
+383,6
@@
RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
}
}
}
}
- tsr.done = true;
-
return ret;
}
return ret;
}