X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_fx_dialog.cc;h=5d8bf57a3b296448052e071b8694c0f5a65f0163;hb=8ada45344e949f3d36a96094ed443cac82ffd3c7;hp=18c5203ac6a32ae04f019a8e046d99c54b8d5df5;hpb=a45aad010f6be34f1b9a28b531458e44ae2d2619;p=ardour.git

diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc
index 18c5203ac6..5d8bf57a3b 100644
--- a/gtk2_ardour/time_fx_dialog.cc
+++ b/gtk2_ardour/time_fx_dialog.cc
@@ -36,17 +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/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
 
@@ -71,13 +62,12 @@ 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) {
@@ -129,7 +119,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 
 		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 {
@@ -186,11 +176,10 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 	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