st.setSetting(SETTING_USE_QUICKSEEK, tsr.quick_seek);
st.setSetting(SETTING_USE_AA_FILTER, tsr.antialias);
- tsr.progress = 0.0f;
}
STStretch::~STStretch ()
}
int
-STStretch::run (boost::shared_ptr<Region> a_region)
+STStretch::run (boost::shared_ptr<Region> a_region, Progress* progress)
{
SourceList nsrcs;
- nframes_t total_frames;
- nframes_t done;
+ framecnt_t total_frames;
+ framecnt_t done;
int ret = -1;
- const nframes_t bufsize = 16384;
+ const framecnt_t bufsize = 16384;
gain_t *gain_buffer = 0;
Sample *buffer = 0;
char suffix[32];
string new_name;
string::size_type at;
- tsr.progress = 0.0f;
+ progress->set_progress (0);
tsr.done = false;
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(a_region);
boost::shared_ptr<AudioSource> asrc
= boost::dynamic_pointer_cast<AudioSource>(nsrcs[i]);
- nframes_t pos = 0;
- nframes_t this_read = 0;
+ framepos_t pos = 0;
+ framecnt_t this_read = 0;
st.clear();
while (!tsr.cancel && pos < region->length()) {
- nframes_t this_time;
+ framecnt_t this_time;
this_time = min (bufsize, region->length() - pos);
pos += this_read;
done += this_read;
- tsr.progress = (float) done / total_frames;
+ progress->set_progress ((float) done / total_frames);
st.putSamples (buffer, this_read);
/* now reset ancestral data for each new region */
for (vector<boost::shared_ptr<Region> >::iterator x = results.begin(); x != results.end(); ++x) {
- nframes64_t astart = (*x)->ancestral_start();
- nframes64_t alength = (*x)->ancestral_length();
- nframes_t start;
- nframes_t length;
+ framepos_t astart = (*x)->ancestral_start();
+ framepos_t alength = (*x)->ancestral_length();
+ framepos_t start;
+ framecnt_t length;
// note: tsr.fraction is a percentage of original length. 100 = no change,
// 50 is half as long, 200 is twice as long, etc.
float stretch = (*x)->stretch() * (tsr.time_fraction/100.0);
- start = (nframes_t) floor (astart + ((astart - (*x)->start()) / stretch));
- length = (nframes_t) floor (alength / stretch);
+ start = (framepos_t) floor (astart + ((astart - (*x)->start()) / stretch));
+ length = (framecnt_t) floor (alength / stretch);
(*x)->set_ancestral_data (start, length, stretch, (*x)->shift());
}
}
}
- tsr.done = true;
-
return ret;
}