X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_timefx.cc;h=c623a3fe1336737bd354bb02711cba2099ed4821;hb=4dc65e66;hp=765030507b649adaf16d916d36ca97fada65f1f8;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 765030507b..c623a3fe13 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -29,6 +29,13 @@ #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 #include "audio_region_view.h" @@ -37,19 +44,12 @@ #include "region_selection.h" #include "time_fx_dialog.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" - #ifdef USE_RUBBERBAND #include using namespace RubberBand; #endif -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -76,6 +76,7 @@ Editor::time_stretch (RegionSelection& regions, float fraction) } if ((aret = time_fx (audio, fraction, false)) != 0) { + commit_reversible_command (); return aret; } @@ -104,7 +105,7 @@ Editor::time_stretch (RegionSelection& regions, float fraction) stretch.run (*i); playlist->replace_region (regions.front()->region(), stretch.results[0], - regions.front()->region()->position()); + regions.front()->region()->position()); midi_playlists_affected.insert (playlist); } @@ -132,6 +133,8 @@ Editor::pitch_shift (RegionSelection& regions, float fraction) if (ret == 0) { commit_reversible_command (); + } else { + abort_reversible_command (); } return ret; @@ -143,22 +146,18 @@ Editor::pitch_shift (RegionSelection& regions, float fraction) int Editor::time_fx (RegionList& regions, float val, bool pitching) { + if (regions.empty()) { + return 0; + } + + const samplecnt_t oldlen = (samplecnt_t) (regions.front()->length()); + const samplecnt_t newlen = (samplecnt_t) (regions.front()->length() * val); + const samplecnt_t pos = regions.front()->position (); + delete current_timefx; - current_timefx = new TimeFXDialog (*this, pitching); + current_timefx = new TimeFXDialog (*this, pitching, oldlen, newlen, pos); current_timefx->regions = regions; - /* See if we have any audio regions on our list */ - RegionList::iterator i = regions.begin (); - while (i != regions.end() && boost::dynamic_pointer_cast (*i) == 0) { - ++i; - } - - if (i == regions.end ()) { - /* No audio regions; we can just do the timefx without a dialogue */ - do_timefx (); - return 0; - } - switch (current_timefx->run ()) { case RESPONSE_ACCEPT: break; @@ -168,34 +167,14 @@ Editor::time_fx (RegionList& regions, float val, bool pitching) } current_timefx->status = 0; + current_timefx->request.time_fraction = current_timefx->get_time_fraction (); + current_timefx->request.pitch_fraction = current_timefx->get_pitch_fraction (); - 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; - + 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 @@ -229,7 +208,31 @@ Editor::time_fx (RegionList& regions, float val, bool pitching) } } - switch (rb_current_opt) { + int rb_mode = rb_current_opt; + + if (pitching /*&& rb_current_opt == 6*/) { + /* The timefx dialog does not show the "stretch_opts_selector" + * when pitch-shifting. So the most recently used option from + * "Time Stretch" would be used (if any). That may even be + * "resample without preserving pitch", which would be invalid. + * + * TODO: also show stretch_opts_selector when pitching (except the option + * to not preserve pitch) and use separate rb_current_opt when pitching. + * + * Actually overhaul this the dialog and processing opts below and use rubberband's + * "Crispness" levels: + * -c 0 equivalent to --no-transients --no-lamination --window-long + * -c 1 equivalent to --detector-soft --no-lamination --window-long (for piano) + * -c 2 equivalent to --no-transients --no-lamination + * -c 3 equivalent to --no-transients + * -c 4 equivalent to --bl-transients + * -c 5 default processing options + * -c 6 equivalent to --no-lamination --window-short (may be good for drums) + */ + rb_mode = 4; + } + + switch (rb_mode) { case 0: transients = NoTransients; peaklock = false; longwin = true; shortwin = false; break; @@ -249,7 +252,7 @@ Editor::time_fx (RegionList& regions, float val, bool pitching) transients = NoTransients; precise = true; preserve_formants = false; - current_timefx->request.pitch_fraction = 1/val; + current_timefx->request.pitch_fraction = 1.0 / current_timefx->request.time_fraction; shortwin = true; // peaklock = false; break; @@ -296,6 +299,8 @@ Editor::time_fx (RegionList& regions, float val, bool pitching) 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; @@ -397,17 +402,16 @@ Editor::timefx_thread (void *arg) 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 ... - */ + /* 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); + struct timespec t = { 2, 0 }; + nanosleep (&t, 0); #endif return 0; } -