X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_fx_dialog.cc;h=5d8bf57a3b296448052e071b8694c0f5a65f0163;hb=c028d223dff472bcadce3cbe9d000f20053de763;hp=04280e00111aee0ec73a1efd1556796dc704b462;hpb=8687895abba4209a6de8d8a8fc1bda5996f0d875;p=ardour.git

diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc
index 04280e0011..5d8bf57a3b 100644
--- a/gtk2_ardour/time_fx_dialog.cc
+++ b/gtk2_ardour/time_fx_dialog.cc
@@ -36,18 +36,8 @@
 #include "audio_region_view.h"
 #include "region_selection.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"
-
 #ifdef USE_RUBBERBAND
-#include "rubberband/RubberBandStretcher.h"
+#include <rubberband/RubberBandStretcher.h>
 using namespace RubberBand;
 #endif
 
@@ -72,19 +62,18 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 	, quick_button (_("Quick but Ugly"))
 	, antialias_button (_("Skip Anti-aliasing"))
 	, stretch_opts_label (_("Contents:"))
-	, precise_button (_("Strict Linear"))
+	, precise_button (_("Minimize time distortion"))
 	, preserve_formants_button(_("Preserve Formants"))
 {
 	set_modal (true);
 	set_skip_taskbar_hint (true);
 	set_resizable (false);
-	set_position (Gtk::WIN_POS_MOUSE);
 	set_name (N_("TimeFXDialog"));
 
 	if (pitching) {
-		set_title (_("Pitch Shift"));
+		set_title (_("Pitch Shift Audio"));
 	} else {
-		set_title (_("Time Stretch"));
+		set_title (_("Time Stretch Audio"));
 	}
 
 	cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -115,20 +104,22 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 		l = manage (new Label (_("Octaves:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 		table->attach (*l, 1, 2, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
 		table->attach (pitch_octave_spinner, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+		pitch_octave_spinner.set_activates_default ();
 
 		l = manage (new Label (_("Semitones:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 		table->attach (*l, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
 		table->attach (pitch_semitone_spinner, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+		pitch_semitone_spinner.set_activates_default ();
 
 		l = manage (new Label (_("Cents:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 		pitch_cent_spinner.set_digits (1);
 		table->attach (*l, 1, 2, 2, 3, Gtk::FILL, Gtk::EXPAND, 0, 0);
 		table->attach (pitch_cent_spinner, 2, 3, 2, 3, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+		pitch_cent_spinner.set_activates_default ();
 
 		table->attach (preserve_formants_button, 1, 3, 3, 4, Gtk::FILL, Gtk::EXPAND, 0, 0);
 
-
-		add_button (_("Shift"), Gtk::RESPONSE_ACCEPT);
+		add_button (S_("Time|Shift"), Gtk::RESPONSE_ACCEPT);
 
 		upper_button_box.pack_start (*table, false, true);
 	} else {
@@ -146,7 +137,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 
 		set_popdown_strings (stretch_opts_selector, editor.rb_opt_strings);
 		/* set default */
-		stretch_opts_selector.set_active_text (editor.rb_opt_strings[4]);
+		stretch_opts_selector.set_active_text (editor.rb_opt_strings[editor.rb_current_opt]);
 		table->attach (stretch_opts_selector, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
 
 		table->attach (precise_button, 1, 3, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
@@ -165,14 +156,14 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 		upper_button_box.pack_start (*table, false, true);
 	}
 
+	set_default_response (Gtk::RESPONSE_ACCEPT);
+	
 	VBox* progress_box = manage (new VBox);
 	progress_box->set_spacing (6);
 
 	l = manage (new Label (_("<b>Progress</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 	l->set_use_markup ();
 
-	progress_bar.set_name (N_("TimeFXProgress"));
-
 	progress_box->pack_start (*l, false, false);
 	progress_box->pack_start (progress_bar, false, true);
 
@@ -182,15 +173,13 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 
 	get_vbox()->pack_start (*vbox, false, false);
 
-
 	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