X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_timefx.cc;h=34c974e102c1b8407eb9ed80b1dde12df4bcccab;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=e31ce4d95549805c07e2073fb02baa910db9d85f;hpb=1d516ac95a61d12dadaaf75c46f792d8e4308578;p=ardour.git

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index e31ce4d955..34c974e102 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,27 +20,28 @@
 #include <iostream>
 #include <cstdlib>
 #include <cmath>
-
+#include <ctime>
 #include <string>
+#include <set>
 
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
 
-#include <gtkmm2ext/window_title.h>
 #include <gtkmm2ext/utils.h>
 
-#include "editor.h"
-#include "audio_time_axis.h"
 #include "audio_region_view.h"
+#include "audio_time_axis.h"
+#include "editor.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/audio_diskstream.h"
 #include "ardour/stretch.h"
 #include "ardour/midi_stretch.h"
 #include "ardour/pitch.h"
@@ -55,184 +56,111 @@ using namespace RubberBand;
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
-Editor::TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
-	: ArdourDialog (X_("time fx dialog")),
-	  editor (e),
-	  pitching (pitch),
-	  pitch_octave_adjustment (0.0, -4.0, 4.0, 1, 2.0),
-	  pitch_semitone_adjustment (0.0, -12.0, 12.0, 1.0, 4.0),
-	  pitch_cent_adjustment (0.0, -499.0, 500.0, 5.0, 15.0),
-	  pitch_octave_spinner (pitch_octave_adjustment),
-	  pitch_semitone_spinner (pitch_semitone_adjustment),
-	  pitch_cent_spinner (pitch_cent_adjustment),
-	  quick_button (_("Quick but Ugly")),
-	  antialias_button (_("Skip Anti-aliasing")),
-	  stretch_opts_label (_("Contents:")),
-	  precise_button (_("Strict Linear")),
-	  preserve_formants_button(_("Preserve Formants"))
+/** @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)
 {
-	set_modal (true);
-	set_position (Gtk::WIN_POS_MOUSE);
-	set_name (N_("TimeFXDialog"));
+	RegionList audio;
+	RegionList midi;
+	int aret;
 
-	WindowTitle title(Glib::get_application_name());
-	if (pitching) {
-		title += _("Pitch Shift");
-	} else {
-		title += _("Time Stretch");
-	}
-	set_title(title.get_string());
+	begin_reversible_command (_("stretch/shrink"));
 
-	cancel_button = add_button (_("Cancel"), Gtk::RESPONSE_CANCEL);
-
-	get_vbox()->set_spacing (5);
-	get_vbox()->set_border_width (12);
-
-	if (pitching) {
-
-		upper_button_box.set_spacing (5);
-		upper_button_box.set_border_width (5);
-		
-		Gtk::Label* l;
-
-		l = manage (new Label (_("Octaves")));
-		upper_button_box.pack_start (*l, false, false);
-		upper_button_box.pack_start (pitch_octave_spinner, false, false);
-
-		l = manage (new Label (_("Semitones (12TET)")));
-		upper_button_box.pack_start (*l, false, false);
-		upper_button_box.pack_start (pitch_semitone_spinner, false, false);
-
-		l = manage (new Label (_("Cents")));
-		upper_button_box.pack_start (*l, false, false);
-		upper_button_box.pack_start (pitch_cent_spinner, false, false);
-
-		pitch_cent_spinner.set_digits (1);
-
-		upper_button_box.pack_start (preserve_formants_button, false, false);
-
-
-		add_button (_("Shift"), Gtk::RESPONSE_ACCEPT);
-
-		get_vbox()->pack_start (upper_button_box, false, false);
+	for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
+		if  ((*i)->region()->data_type() == DataType::AUDIO) {
+			audio.push_back ((*i)->region());
+		} else if  ((*i)->region()->data_type() == DataType::MIDI) {
+			midi.push_back ((*i)->region());
+		}
+	}
 
-	} else {
+	if ((aret = time_fx (audio, fraction, false)) != 0) {
+		return aret;
+	}
 
-#ifdef USE_RUBBERBAND
-		opts_box.set_spacing (5);
-		opts_box.set_border_width (5);
-		vector<string> strings;
+	set<boost::shared_ptr<Playlist> > midi_playlists_affected;
 
-		set_popdown_strings (stretch_opts_selector, editor.rb_opt_strings);
-		/* set default */
-		stretch_opts_selector.set_active_text (editor.rb_opt_strings[4]);
+	for (RegionList::iterator i = midi.begin(); i != midi.end(); ++i) {
+		boost::shared_ptr<Playlist> playlist = (*i)->playlist();
 
-		opts_box.pack_start (precise_button, false, false);
-		opts_box.pack_start (stretch_opts_label, false, false);
-		opts_box.pack_start (stretch_opts_selector, false, false);
+		if (playlist) {
+			playlist->clear_changes ();
+		}
 
-		get_vbox()->pack_start (opts_box, false, false);
+	}
 
-#else
-		upper_button_box.set_homogeneous (true);
-		upper_button_box.set_spacing (5);
-		upper_button_box.set_border_width (5);
+	ARDOUR::TimeFXRequest request;
+	request.time_fraction = fraction;
 
-		upper_button_box.pack_start (quick_button, true, true);
-		upper_button_box.pack_start (antialias_button, true, true);
+	for (RegionList::iterator i = midi.begin(); i != midi.end(); ++i) {
+		boost::shared_ptr<Playlist> playlist = (*i)->playlist();
 
-		quick_button.set_name (N_("TimeFXButton"));
-		antialias_button.set_name (N_("TimeFXButton"));
+		if (!playlist) {
+			continue;
+		}
 
-		get_vbox()->pack_start (upper_button_box, false, false);
+		MidiStretch stretch (*_session, request);
+		stretch.run (*i);
 
-#endif	
-		add_button (_("Stretch/Shrink"), Gtk::RESPONSE_ACCEPT);
+		playlist->replace_region (regions.front()->region(), stretch.results[0],
+					  regions.front()->region()->position());
+		midi_playlists_affected.insert (playlist);
 	}
 
-	get_vbox()->pack_start (progress_bar);
+	for (set<boost::shared_ptr<Playlist> >::iterator p = midi_playlists_affected.begin(); p != midi_playlists_affected.end(); ++p) {
+		_session->add_command (new StatefulDiffCommand (*p));
+	}
 
-	progress_bar.set_name (N_("TimeFXProgress"));
+	commit_reversible_command ();
 
-	show_all_children ();
+	return 0;
 }
 
-gint
-Editor::TimeFXDialog::update_progress ()
+int
+Editor::pitch_shift (RegionSelection& regions, float fraction)
 {
-	progress_bar.set_fraction (request.progress);
-	return !request.done;
-}
+	RegionList rl;
 
-void
-Editor::TimeFXDialog::cancel_in_progress ()
-{
-	status = -2;
-	request.cancel = true;
-	first_cancel.disconnect();
-}
+	for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
+		rl.push_back ((*i)->region());
+	}
 
-gint
-Editor::TimeFXDialog::delete_in_progress (GdkEventAny* ev)
-{
-	status = -2;
-	request.cancel = true;
-	first_delete.disconnect();
-	return TRUE;
-}
+	begin_reversible_command (_("pitch shift"));
 
-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);
-	} else {
-		// MIDI, just stretch
-		RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&regions.front()->get_time_axis_view());
-		if (!rtv)
-			return -1;
-		
-		boost::shared_ptr<Playlist> playlist
-			= rtv->track()->diskstream()->playlist();
-
-	    ARDOUR::TimeFXRequest request;
-		request.time_fraction = fraction;
-		MidiStretch stretch(*session, request);
-		begin_reversible_command ("midi stretch");
-		stretch.run(regions.front()->region());
-		XMLNode &before = playlist->get_state();
-		playlist->replace_region (regions.front()->region(), stretch.results[0],
-				regions.front()->region()->position());
-		XMLNode &after = playlist->get_state();
-		session->add_command (new MementoCommand<Playlist>(*playlist, &before, &after));
+	int ret = time_fx (rl, fraction, true);
+
+	if (ret == 0) {
 		commit_reversible_command ();
 	}
 
-	return 0;
-}
-
-int
-Editor::pitch_shift (RegionSelection& regions, float fraction)
-{
-	return time_fx (regions, fraction, true);
+	return ret;
 }
 
+/** @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)
+Editor::time_fx (RegionList& regions, float val, bool pitching)
 {
 	delete current_timefx;
-
 	current_timefx = new TimeFXDialog (*this, pitching);
+	current_timefx->regions = regions;
 
-	current_timefx->progress_bar.set_fraction (0.0f);
+	/* See if we have any audio regions on our list */
+	RegionList::iterator i = regions.begin ();
+	while (i != regions.end() && boost::dynamic_pointer_cast<AudioRegion> (*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;
@@ -242,7 +170,6 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
 	}
 
 	current_timefx->status = 0;
-	current_timefx->regions = regions;
 
 	if (pitching) {
 
@@ -260,12 +187,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;
@@ -291,39 +218,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 */
+	for (int i = 0; i <= 6; i++) {
+		if (txt == rb_opt_strings[i]) {
+			rb_current_opt = i;
+			break;
+		}
+	}
 
-		transients = Transients; peaklock = true; longwin = false; shortwin = false; 
+	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;
 
-	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;
@@ -341,21 +285,20 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
 	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;
-	
+
 	/* 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", &current_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", &current_timefx->request.thread, timefx_thread, current_timefx)) {
 		current_timefx->hide ();
 		error << _("timefx cannot be started - thread creation error") << endmsg;
 		return -1;
@@ -363,73 +306,63 @@ 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);
-
 	while (!current_timefx->request.done && !current_timefx->request.cancel) {
 		gtk_main_iteration ();
 	}
 
-	c.disconnect ();
-	
 	current_timefx->hide ();
 	return current_timefx->status;
 }
 
 void
-Editor::do_timefx (TimeFXDialog& dialog)
+Editor::do_timefx ()
 {
-	Track*    t;
 	boost::shared_ptr<Playlist> playlist;
 	boost::shared_ptr<Region>   new_region;
-	bool in_command = false;
-	
-	for (RegionSelection::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ) {
-		AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
+	set<boost::shared_ptr<Playlist> > playlists_affected;
 
-		if (!arv) {
-			continue;
-		}
+	uint32_t const N = current_timefx->regions.size ();
 
-		boost::shared_ptr<AudioRegion> region (arv->audio_region());
-		TimeAxisView* tv = &(arv->get_time_axis_view());
-		RouteTimeAxisView* rtv;
-		RegionSelection::iterator tmp;
-		
-		tmp = i;
-		++tmp;
+	for (RegionList::iterator i = current_timefx->regions.begin(); i != current_timefx->regions.end(); ++i) {
+		boost::shared_ptr<Playlist> playlist = (*i)->playlist();
 
-		if ((rtv = dynamic_cast<RouteTimeAxisView*> (tv)) == 0) {
-			i = tmp;
-			continue;
+		if (playlist) {
+			playlist->clear_changes ();
 		}
+	}
 
-		if ((t = dynamic_cast<Track*> (rtv->route().get())) == 0) {
-			i = tmp;
-			continue;
-		}
-	
-		if ((playlist = t->diskstream()->playlist()) == 0) {
-			i = tmp;
+	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);
+
+		if (!region || (playlist = region->playlist()) == 0) {
 			continue;
 		}
 
-		if (dialog.request.cancel) {
+		if (current_timefx->request.cancel) {
 			/* we were cancelled */
-			dialog.status = 1;
+			/* XXX what to do about playlists already affected ? */
+			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 {
-			fx = new Stretch (*session, dialog.request);
+#ifdef USE_RUBBERBAND
+			fx = new RBStretch (*_session, current_timefx->request);
+#else
+			fx = new STStretch (*_session, current_timefx->request);
+#endif
 		}
 
-		if (fx->run (region)) {
-			dialog.status = -1;
-			dialog.request.done = true;
+		current_timefx->descend (1.0 / N);
+
+		if (fx->run (region, current_timefx)) {
+			current_timefx->status = -1;
+			current_timefx->request.done = true;
 			delete fx;
 			return;
 		}
@@ -437,39 +370,40 @@ Editor::do_timefx (TimeFXDialog& dialog)
 		if (!fx->results.empty()) {
 			new_region = fx->results.front();
 
-			if (!in_command) {
-				begin_reversible_command (dialog.pitching ? _("pitch shift") : _("time stretch"));
-				in_command = true;
-			}
-
-			XMLNode &before = playlist->get_state();
 			playlist->replace_region (region, new_region, region->position());
-			XMLNode &after = playlist->get_state();
-			session->add_command (new MementoCommand<Playlist>(*playlist, &before, &after));
+			playlists_affected.insert (playlist);
 		}
 
-		i = tmp;
+		current_timefx->ascend ();
 		delete fx;
 	}
 
-	if (in_command) {
-		commit_reversible_command ();
+	for (set<boost::shared_ptr<Playlist> >::iterator p = playlists_affected.begin(); p != playlists_affected.end(); ++p) {
+		_session->add_command (new StatefulDiffCommand (*p));
 	}
 
-	dialog.status = 0;
-	dialog.request.done = true;
+	current_timefx->status = 0;
+	current_timefx->request.done = true;
 }
 
 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<TimeFXDialog*>(arg);
 
 	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 ...
+        */
+
+        struct timespec t = { 2, 0 };
+        nanosleep (&t, 0);
 
 	return 0;
 }