diff options
| author | David Robillard <d@drobilla.net> | 2008-01-10 22:22:29 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-10 22:22:29 +0000 |
| commit | 8a2e30816ee392b871c5918f769f68cc0196a893 (patch) | |
| tree | eb85739049c0adc6186eea635aaaf65ef03f038f /libs/ardour/rb_effect.cc | |
| parent | bb457bb960c5bd7ed538f9d31477293415739f68 (diff) | |
Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/rb_effect.cc')
| -rw-r--r-- | libs/ardour/rb_effect.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index 0de5a5bf4a..7a948f6004 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -75,7 +75,7 @@ RBEffect::run (boost::shared_ptr<AudioRegion> region) int avail = 0; RubberBandStretcher stretcher (session.frame_rate(), region->n_channels(), - RubberBandStretcher::DefaultOptions, + (RubberBandStretcher::Options) tsr.opts, tsr.time_fraction, tsr.pitch_fraction); stretcher.setExpectedInputDuration(region->length()); @@ -155,7 +155,7 @@ RBEffect::run (boost::shared_ptr<AudioRegion> region) pos += this_read; done += this_read; - tsr.progress = ((float) done / duration) * 0.75; + tsr.progress = ((float) done / duration) * 0.25; stretcher.study(buffers, this_read, pos == duration); } @@ -193,7 +193,7 @@ RBEffect::run (boost::shared_ptr<AudioRegion> region) pos += this_read; done += this_read; - tsr.progress = 0.75 + ((float) done / duration) * 0.25; + tsr.progress = 0.25 + ((float) done / duration) * 0.75; stretcher.process(buffers, this_read, pos == duration); |