X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_fx_dialog.h;h=424bfe98139bdfecac78e52fb6b7ed69e911284d;hb=13f51112c965677a4925bf03e8cc3413e10a572b;hp=d5ec54c4845a507e4bbb4eb672dd918f7c81bfd4;hpb=eeae6aec340d74eba7f5d00e450cbe47afcf0ec0;p=ardour.git

diff --git a/gtk2_ardour/time_fx_dialog.h b/gtk2_ardour/time_fx_dialog.h
index d5ec54c484..424bfe9813 100644
--- a/gtk2_ardour/time_fx_dialog.h
+++ b/gtk2_ardour/time_fx_dialog.h
@@ -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
@@ -22,12 +22,16 @@
 
 #include <gtkmm.h>
 
+#include "ardour/timefx_request.h"
+
 #include "ardour_dialog.h"
-#include "region_selection.h"
+#include "progress_reporter.h"
 
 class Editor;
 
-struct TimeFXDialog : public ArdourDialog {
+class TimeFXDialog : public ArdourDialog, public ProgressReporter
+{
+public:
     ARDOUR::TimeFXRequest request;
     Editor&               editor;
     bool                  pitching;
@@ -37,20 +41,19 @@ struct TimeFXDialog : public ArdourDialog {
     Gtk::SpinButton       pitch_octave_spinner;
     Gtk::SpinButton       pitch_semitone_spinner;
     Gtk::SpinButton       pitch_cent_spinner;
-    RegionSelection       regions;
     Gtk::ProgressBar      progress_bar;
+    ARDOUR::RegionList    regions;
 
     /* SoundTouch */
-    Gtk::ToggleButton     quick_button;
-    Gtk::ToggleButton     antialias_button;
-    Gtk::HBox             upper_button_box;
+    Gtk::CheckButton      quick_button;
+    Gtk::CheckButton      antialias_button;
+    Gtk::VBox             upper_button_box;
 
     /* RubberBand */
     Gtk::ComboBoxText     stretch_opts_selector;
     Gtk::Label            stretch_opts_label;
-    Gtk::ToggleButton     precise_button;
-    Gtk::ToggleButton     preserve_formants_button;
-    Gtk::HBox             opts_box;
+    Gtk::CheckButton      precise_button;
+    Gtk::CheckButton      preserve_formants_button;
 
     Gtk::Button*          cancel_button;
     Gtk::Button*          action_button;
@@ -59,11 +62,14 @@ struct TimeFXDialog : public ArdourDialog {
 
     TimeFXDialog (Editor& e, bool for_pitch);
 
-    gint update_progress ();
     sigc::connection first_cancel;
     sigc::connection first_delete;
     void cancel_in_progress ();
     gint delete_in_progress (GdkEventAny*);
+
+private:
+	
+    void update_progress_gui (float);
 };
 
 #endif /* __ardour_time_fx_dialog_h__ */