RegionSelection rs;
rs.add (_primary);
- if (_editor->time_stretch (rs, percentage) == -1) {
+ RegionSelection all = _editor->get_equivalent_regions (rs, ARDOUR::Properties::edit.property_id);
+
+ if (_editor->time_stretch (all, percentage) == -1) {
error << _("An error occurred while executing time stretch operation") << endmsg;
}
}
current_timefx = new TimeFXDialog (*this, pitching);
- current_timefx->progress_bar.set_fraction (0.0f);
-
switch (current_timefx->run ()) {
case RESPONSE_ACCEPT:
break;
current_timefx->request.quick_seek = current_timefx->quick_button.get_active();
current_timefx->request.antialias = !current_timefx->antialias_button.get_active();
#endif
- current_timefx->request.progress = 0.0f;
current_timefx->request.done = false;
current_timefx->request.cancel = false;
pthread_detach (current_timefx->request.thread);
- sigc::connection c = Glib::signal_timeout().connect (sigc::mem_fun (current_timefx, &TimeFXDialog::update_progress), 100);
-
while (!current_timefx->request.done && !current_timefx->request.cancel) {
gtk_main_iteration ();
}
- c.disconnect ();
-
current_timefx->hide ();
return current_timefx->status;
}
boost::shared_ptr<Region> new_region;
bool in_command = false;
+ uint32_t const N = dialog.regions.size ();
+
for (RegionSelection::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
#endif
}
- if (fx->run (region)) {
+ current_timefx->descend (1.0 / N);
+
+ if (fx->run (region, current_timefx)) {
dialog.status = -1;
dialog.request.done = true;
delete fx;
_session->add_command (new StatefulDiffCommand (playlist));
}
+ current_timefx->ascend ();
+
i = tmp;
delete fx;
}
show_all_children ();
}
-gint
-TimeFXDialog::update_progress ()
+void
+TimeFXDialog::update_progress_gui (float p)
{
- progress_bar.set_fraction (request.progress);
- return !request.done;
+ progress_bar.set_fraction (p);
}
void
#include "ardour_dialog.h"
#include "region_selection.h"
+#include "progress_reporter.h"
class Editor;
-struct TimeFXDialog : public ArdourDialog {
+class TimeFXDialog : public ArdourDialog, public ProgressReporter
+{
+public:
ARDOUR::TimeFXRequest request;
Editor& editor;
bool pitching;
TimeFXDialog (Editor& e, bool for_pitch);
- gint update_progress ();
sigc::connection first_cancel;
sigc::connection first_delete;
void cancel_in_progress ();
gint delete_in_progress (GdkEventAny*);
+
+private:
+
+ void update_progress_gui (float);
};
#endif /* __ardour_time_fx_dialog_h__ */
Pitch (ARDOUR::Session&, TimeFXRequest&);
~Pitch () {}
- int run (boost::shared_ptr<ARDOUR::Region>);
+ int run (boost::shared_ptr<ARDOUR::Region>, Progress *);
private:
TimeFXRequest& tsr;
#include "ardour/audiofilesource.h"
#include "ardour/session.h"
#include "ardour/audioregion.h"
+#include "ardour/progress.h"
#include "i18n.h"
, tsr (req)
{
- tsr.progress = 0.0f;
+
}
RBEffect::~RBEffect ()
}
int
-RBEffect::run (boost::shared_ptr<Region> r, Progress*)
+RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
{
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (r);
(session.frame_rate(), channels,
(RubberBandStretcher::Options) tsr.opts, stretch, shift);
- tsr.progress = 0.0f;
+ progress->set_progress (0);
tsr.done = false;
stretcher.setExpectedInputDuration(read_duration);
pos += this_read;
done += this_read;
- tsr.progress = ((float) done / read_duration) * 0.25;
+ progress->set_progress (((float) done / read_duration) * 0.25);
stretcher.study(buffers, this_read, pos == read_duration);
}
pos += this_read;
done += this_read;
- tsr.progress = 0.25 + ((float) done / read_duration) * 0.75;
+ progress->set_progress (0.25 + ((float) done / read_duration) * 0.75);
stretcher.process(buffers, this_read, pos == read_duration);
, tsr (req)
{
- tsr.progress = 0.0f;
+
}
int
Pitch::run (boost::shared_ptr<Region> region)
{
- tsr.progress = 1.0f;
tsr.done = true;
return 1;
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;
framecnt_t total_frames;
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);
pos += this_read;
done += this_read;
- tsr.progress = (float) done / total_frames;
+ progress->set_progress ((float) done / total_frames);
st.putSamples (buffer, this_read);