#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h"
+#include "ardour/audioregion.h"
+#include "ardour/midi_stretch.h"
+#include "ardour/pitch.h"
+#include "ardour/region.h"
+#include "ardour/session.h"
+#include "ardour/stretch.h"
+
#include <gtkmm2ext/utils.h>
#include "audio_region_view.h"
#include "region_selection.h"
#include "time_fx_dialog.h"
-#include "ardour/session.h"
-#include "ardour/region.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audio_track.h"
-#include "ardour/audioregion.h"
-#include "ardour/stretch.h"
-#include "ardour/midi_stretch.h"
-#include "ardour/pitch.h"
-
#ifdef USE_RUBBERBAND
-#include "rubberband/RubberBandStretcher.h"
+#include <rubberband/RubberBandStretcher.h>
using namespace RubberBand;
#endif
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
}
if ((aret = time_fx (audio, fraction, false)) != 0) {
+ commit_reversible_command ();
return aret;
}
if (ret == 0) {
commit_reversible_command ();
+ } else {
+ abort_reversible_command ();
}
return ret;
int
Editor::time_fx (RegionList& regions, float val, bool pitching)
{
- delete current_timefx;
+ if (regions.empty()) {
+ return 0;
+ }
- current_timefx = new TimeFXDialog (*this, pitching);
+ const framecnt_t oldlen = (framecnt_t) (regions.front()->length());
+ const framecnt_t newlen = (framecnt_t) (regions.front()->length() * val);
+ const framecnt_t pos = regions.front()->position ();
+
+ delete current_timefx;
+ current_timefx = new TimeFXDialog (*this, pitching, oldlen, newlen, pos);
+ current_timefx->regions = regions;
switch (current_timefx->run ()) {
case RESPONSE_ACCEPT:
}
current_timefx->status = 0;
- current_timefx->regions = regions;
-
- if (pitching) {
-
- float cents = current_timefx->pitch_octave_adjustment.get_value() * 1200.0;
- float pitch_fraction;
- cents += current_timefx->pitch_semitone_adjustment.get_value() * 100.0;
- cents += current_timefx->pitch_cent_adjustment.get_value();
-
- if (cents == 0.0) {
- // user didn't change anything
- current_timefx->hide ();
- return 0;
- }
-
- // one octave == 1200 cents
- // adding one octave doubles the frequency
- // ratio is 2^^octaves
-
- pitch_fraction = pow(2, cents/1200);
-
- current_timefx->request.time_fraction = 1.0;
- current_timefx->request.pitch_fraction = pitch_fraction;
-
- } else {
-
- current_timefx->request.time_fraction = val;
- current_timefx->request.pitch_fraction = 1.0;
+ current_timefx->request.time_fraction = current_timefx->get_time_fraction ();
+ current_timefx->request.pitch_fraction = current_timefx->get_pitch_fraction ();
+ if (current_timefx->request.time_fraction == 1.0 &&
+ current_timefx->request.pitch_fraction == 1.0) {
+ /* nothing to do */
+ current_timefx->hide ();
+ return 0;
}
#ifdef USE_RUBBERBAND
current_timefx->first_delete = current_timefx->signal_delete_event().connect
(sigc::mem_fun (current_timefx, &TimeFXDialog::delete_in_progress));
+ current_timefx->start_updates ();
+
if (pthread_create_and_store ("timefx", ¤t_timefx->request.thread, timefx_thread, current_timefx)) {
current_timefx->hide ();
error << _("timefx cannot be started - thread creation error") << endmsg;
gtk_main_iteration ();
}
+ pthread_join (current_timefx->request.thread, 0);
+
current_timefx->hide ();
return current_timefx->status;
}
void
-Editor::do_timefx (TimeFXDialog& dialog)
+Editor::do_timefx ()
{
boost::shared_ptr<Playlist> playlist;
boost::shared_ptr<Region> new_region;
set<boost::shared_ptr<Playlist> > playlists_affected;
- uint32_t const N = dialog.regions.size ();
+ uint32_t const N = current_timefx->regions.size ();
- for (RegionList::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ++i) {
+ for (RegionList::iterator i = current_timefx->regions.begin(); i != current_timefx->regions.end(); ++i) {
boost::shared_ptr<Playlist> playlist = (*i)->playlist();
if (playlist) {
}
}
- for (RegionList::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ++i) {
+ for (RegionList::iterator i = current_timefx->regions.begin(); i != current_timefx->regions.end(); ++i) {
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (*i);
continue;
}
- if (dialog.request.cancel) {
+ if (current_timefx->request.cancel) {
/* we were cancelled */
/* XXX what to do about playlists already affected ? */
- dialog.status = 1;
+ current_timefx->status = 1;
return;
}
Filter* fx;
- if (dialog.pitching) {
- fx = new Pitch (*_session, dialog.request);
+ if (current_timefx->pitching) {
+ fx = new Pitch (*_session, current_timefx->request);
} else {
#ifdef USE_RUBBERBAND
- fx = new RBStretch (*_session, dialog.request);
+ fx = new RBStretch (*_session, current_timefx->request);
#else
- fx = new STStretch (*_session, dialog.request);
+ fx = new STStretch (*_session, current_timefx->request);
#endif
}
current_timefx->descend (1.0 / N);
if (fx->run (region, current_timefx)) {
- dialog.status = -1;
- dialog.request.done = true;
+ current_timefx->status = -1;
+ current_timefx->request.done = true;
delete fx;
return;
}
_session->add_command (new StatefulDiffCommand (*p));
}
- dialog.status = 0;
- dialog.request.done = true;
+ current_timefx->status = 0;
+ current_timefx->request.done = true;
}
void*
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
- tsd->editor.do_timefx (*tsd);
+ tsd->editor.do_timefx ();
/* GACK! HACK! sleep for a bit so that our request buffer for the GUI
event loop doesn't die before any changes we made are processed
by the GUI ...
*/
+#ifdef PLATFORM_WINDOWS
+ Glib::usleep(2 * G_USEC_PER_SEC);
+#else
struct timespec t = { 2, 0 };
nanosleep (&t, 0);
-
+#endif
return 0;
}
-
projects / ardour.git / blobdiff