X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_fx_dialog.cc;h=f166768834517130f2f5ab549ac78ab59c03f706;hb=04db4c788c8bf5070eb13b9165277ea81ab50070;hp=a7c7d6ee6030c69d205f896656cfc2e2f97cb682;hpb=c02b88b9698a3368329403a82d18d4bc9677852c;p=ardour.git

diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc
index a7c7d6ee60..f166768834 100644
--- a/gtk2_ardour/time_fx_dialog.cc
+++ b/gtk2_ardour/time_fx_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2009 Paul Davis 
+    Copyright (C) 2000-2009 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
@@ -29,7 +29,6 @@
 #include "pbd/pthread_utils.h"
 #include "pbd/memento_command.h"
 
-#include <gtkmm2ext/window_title.h>
 #include <gtkmm2ext/utils.h>
 
 #include "editor.h"
@@ -42,7 +41,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"
@@ -57,7 +55,6 @@ using namespace RubberBand;
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
@@ -83,13 +80,11 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 	set_position (Gtk::WIN_POS_MOUSE);
 	set_name (N_("TimeFXDialog"));
 
-	WindowTitle title(Glib::get_application_name());
 	if (pitching) {
-		title += _("Pitch Shift");
+		set_title (_("Pitch Shift"));
 	} else {
-		title += _("Time Stretch");
+		set_title (_("Time Stretch"));
 	}
-	set_title(title.get_string());
 
 	cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
 
@@ -150,7 +145,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);
@@ -162,7 +157,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 		antialias_button.set_name (N_("TimeFXButton"));
 		table->attach (antialias_button, 1, 3, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
 
-#endif	
+#endif
 
 		add_button (_("Stretch/Shrink"), Gtk::RESPONSE_ACCEPT);
 
@@ -175,8 +170,6 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 	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);
 
@@ -186,7 +179,7 @@ TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
 
 	get_vbox()->pack_start (*vbox, false, false);
 
-	
+
 	show_all_children ();
 }
 
@@ -206,7 +199,7 @@ TimeFXDialog::cancel_in_progress ()
 }
 
 gint
-TimeFXDialog::delete_in_progress (GdkEventAny* ev)
+TimeFXDialog::delete_in_progress (GdkEventAny*)
 {
 	status = -2;
 	request.cancel = true;