X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_timefx.cc;h=1c4162eda2c9e4735dc7d63f6970e05f1a95b922;hb=5173497c6d9b4bed0f64c1c3b4beab442a405849;hp=4339962a87cbcb802c7526b997b96bc9fe197e1f;hpb=64f9b257d96a396826e3c68b8ea4896ca24d4c7b;p=ardour.git diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 4339962a87..1c4162eda2 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,14 +20,15 @@ #include #include #include +#include #include #include "pbd/error.h" #include "pbd/pthread_utils.h" #include "pbd/memento_command.h" +#include "pbd/stateful_diff_command.h" -#include #include #include "audio_region_view.h" @@ -41,7 +42,6 @@ #include "ardour/audioplaylist.h" #include "ardour/audio_track.h" #include "ardour/audioregion.h" -#include "ardour/audio_diskstream.h" #include "ardour/stretch.h" #include "ardour/midi_stretch.h" #include "ardour/pitch.h" @@ -56,15 +56,15 @@ using namespace RubberBand; using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; +/** @return -1 in case of error, 1 if operation was cancelled by the user, 0 if everything went ok */ int Editor::time_stretch (RegionSelection& regions, float fraction) { // FIXME: kludge, implement stretching of selection of both types - + if (regions.front()->region()->data_type() == DataType::AUDIO) { // Audio, pop up timefx dialog return time_fx (regions, fraction, false); @@ -73,20 +73,18 @@ Editor::time_stretch (RegionSelection& regions, float fraction) RouteTimeAxisView* rtv = dynamic_cast (®ions.front()->get_time_axis_view()); if (!rtv) return -1; - - boost::shared_ptr playlist - = rtv->track()->diskstream()->playlist(); - ARDOUR::TimeFXRequest request; + boost::shared_ptr playlist = rtv->track()->playlist(); + + ARDOUR::TimeFXRequest request; request.time_fraction = fraction; - MidiStretch stretch(*session, request); + MidiStretch stretch(*_session, request); begin_reversible_command ("midi stretch"); stretch.run(regions.front()->region()); - XMLNode &before = playlist->get_state(); + playlist->clear_changes (); playlist->replace_region (regions.front()->region(), stretch.results[0], regions.front()->region()->position()); - XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand(*playlist, &before, &after)); + _session->add_command (new StatefulDiffCommand (playlist)); commit_reversible_command (); } @@ -99,6 +97,9 @@ Editor::pitch_shift (RegionSelection& regions, float fraction) return time_fx (regions, fraction, true); } +/** @param val Percentage to time stretch by; ignored if pitch-shifting. + * @param pitching true to pitch shift, false to time stretch. + * @return -1 in case of error, 1 if operation was cancelled by the user, 0 if everything went ok */ int Editor::time_fx (RegionSelection& regions, float val, bool pitching) { @@ -135,12 +136,12 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching) // 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; @@ -166,35 +167,56 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching) BandLimitedTransients, Transients } transients = Transients; - + precise = current_timefx->precise_button.get_active(); preserve_formants = current_timefx->preserve_formants_button.get_active(); - - txt = current_timefx->stretch_opts_selector.get_active_text (); - if (txt == rb_opt_strings[0]) { - transients = NoTransients; peaklock = false; longwin = true; shortwin = false; - } else if (txt == rb_opt_strings[1]) { - transients = NoTransients; peaklock = false; longwin = false; shortwin = false; - } else if (txt == rb_opt_strings[2]) { - transients = NoTransients; peaklock = true; longwin = false; shortwin = false; - } else if (txt == rb_opt_strings[3]) { - transients = BandLimitedTransients; peaklock = true; longwin = false; shortwin = false; - } else if (txt == rb_opt_strings[5]) { - transients = Transients; peaklock = false; longwin = false; shortwin = true; - } else { - /* default/4 */ + txt = current_timefx->stretch_opts_selector.get_active_text (); - transients = Transients; peaklock = true; longwin = false; shortwin = false; + for (int i = 0; i <= 6; i++) { + if (txt == rb_opt_strings[i]) { + rb_current_opt = i; + break; + } } + switch (rb_current_opt) { + case 0: + transients = NoTransients; peaklock = false; longwin = true; shortwin = false; + break; + case 1: + transients = NoTransients; peaklock = false; longwin = false; shortwin = false; + break; + case 2: + transients = NoTransients; peaklock = true; longwin = false; shortwin = false; + break; + case 3: + transients = BandLimitedTransients; peaklock = true; longwin = false; shortwin = false; + break; + case 5: + transients = Transients; peaklock = false; longwin = false; shortwin = true; + break; + case 6: + transients = NoTransients; + precise = true; + preserve_formants = false; + current_timefx->request.pitch_fraction = 1/val; + shortwin = true; + // peaklock = false; + break; + default: + /* default/4 */ + transients = Transients; peaklock = true; longwin = false; shortwin = false; + break; + }; + if (realtime) options |= RubberBandStretcher::OptionProcessRealTime; if (precise) options |= RubberBandStretcher::OptionStretchPrecise; if (preserve_formants) options |= RubberBandStretcher::OptionFormantPreserved; if (!peaklock) options |= RubberBandStretcher::OptionPhaseIndependent; if (longwin) options |= RubberBandStretcher::OptionWindowLong; if (shortwin) options |= RubberBandStretcher::OptionWindowShort; - + switch (transients) { case NoTransients: options |= RubberBandStretcher::OptionTransientsSmooth; @@ -215,18 +237,18 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching) current_timefx->request.progress = 0.0f; current_timefx->request.done = false; current_timefx->request.cancel = false; - + /* re-connect the cancel button and delete events */ - + current_timefx->first_cancel.disconnect(); current_timefx->first_delete.disconnect(); - - current_timefx->first_cancel = current_timefx->cancel_button->signal_clicked().connect - (mem_fun (current_timefx, &TimeFXDialog::cancel_in_progress)); - current_timefx->first_delete = current_timefx->signal_delete_event().connect - (mem_fun (current_timefx, &TimeFXDialog::delete_in_progress)); - if (pthread_create_and_store ("timefx", ¤t_timefx->request.thread, 0, timefx_thread, current_timefx)) { + current_timefx->first_cancel = current_timefx->cancel_button->signal_clicked().connect + (sigc::mem_fun (current_timefx, &TimeFXDialog::cancel_in_progress)); + current_timefx->first_delete = current_timefx->signal_delete_event().connect + (sigc::mem_fun (current_timefx, &TimeFXDialog::delete_in_progress)); + + 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; return -1; @@ -234,14 +256,14 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching) pthread_detach (current_timefx->request.thread); - sigc::connection c = Glib::signal_timeout().connect (mem_fun (current_timefx, &TimeFXDialog::update_progress), 100); + 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; } @@ -253,7 +275,7 @@ Editor::do_timefx (TimeFXDialog& dialog) boost::shared_ptr playlist; boost::shared_ptr new_region; bool in_command = false; - + for (RegionSelection::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ) { AudioRegionView* arv = dynamic_cast(*i); @@ -265,7 +287,7 @@ Editor::do_timefx (TimeFXDialog& dialog) TimeAxisView* tv = &(arv->get_time_axis_view()); RouteTimeAxisView* rtv; RegionSelection::iterator tmp; - + tmp = i; ++tmp; @@ -278,8 +300,8 @@ Editor::do_timefx (TimeFXDialog& dialog) i = tmp; continue; } - - if ((playlist = t->diskstream()->playlist()) == 0) { + + if ((playlist = t->playlist()) == 0) { i = tmp; continue; } @@ -293,12 +315,12 @@ Editor::do_timefx (TimeFXDialog& dialog) Filter* fx; if (dialog.pitching) { - fx = new Pitch (*session, dialog.request); + fx = new Pitch (*_session, dialog.request); } else { #ifdef USE_RUBBERBAND - fx = new RBStretch (*session, dialog.request); + fx = new RBStretch (*_session, dialog.request); #else - fx = new STStretch (*session, dialog.request); + fx = new STStretch (*_session, dialog.request); #endif } @@ -313,14 +335,13 @@ Editor::do_timefx (TimeFXDialog& dialog) new_region = fx->results.front(); if (!in_command) { - session->begin_reversible_command (dialog.pitching ? _("pitch shift") : _("time stretch")); + _session->begin_reversible_command (dialog.pitching ? _("pitch shift") : _("time stretch")); in_command = true; } - XMLNode &before = playlist->get_state(); + playlist->clear_changes (); playlist->replace_region (region, new_region, region->position()); - XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand(*playlist, &before, &after)); + _session->add_command (new StatefulDiffCommand (playlist)); } i = tmp; @@ -328,7 +349,7 @@ Editor::do_timefx (TimeFXDialog& dialog) } if (in_command) { - session->commit_reversible_command (); + _session->commit_reversible_command (); } dialog.status = 0; @@ -338,7 +359,7 @@ Editor::do_timefx (TimeFXDialog& dialog) void* Editor::timefx_thread (void *arg) { - PBD::notify_gui_about_thread_creation (pthread_self(), X_("TimeFX")); + SessionEvent::create_per_thread_pool ("timefx events", 64); TimeFXDialog* tsd = static_cast(arg); @@ -346,6 +367,14 @@ Editor::timefx_thread (void *arg) tsd->editor.do_timefx (*tsd); + /* 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 ... + */ + + struct timespec t = { 2, 0 }; + nanosleep (&t, 0); + return 0; }