From e98553edfabaf05a7adb7e828b6c2e7a4b38c305 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 22 Feb 2016 10:17:09 -0500 Subject: more work on time/pitch stretch/shifting Clock and percent measure are now linked, not alternatives. Threading for GUI updates is now safe. --- gtk2_ardour/time_fx_dialog.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/time_fx_dialog.h') diff --git a/gtk2_ardour/time_fx_dialog.h b/gtk2_ardour/time_fx_dialog.h index c2616b6d2b..03e0ccfdcd 100644 --- a/gtk2_ardour/time_fx_dialog.h +++ b/gtk2_ardour/time_fx_dialog.h @@ -72,6 +72,8 @@ class TimeFXDialog : public ArdourDialog, public ProgressReporter float get_time_fraction () const; float get_pitch_fraction () const; + void start_updates (); + private: ARDOUR::framecnt_t original_length; Gtk::Adjustment pitch_octave_adjustment; @@ -80,12 +82,17 @@ class TimeFXDialog : public ArdourDialog, public ProgressReporter Gtk::SpinButton pitch_octave_spinner; Gtk::SpinButton pitch_semitone_spinner; Gtk::SpinButton pitch_cent_spinner; - Gtk::Adjustment percent_adjustment; + Gtk::Adjustment duration_adjustment; AudioClock* duration_clock; - Gtk::RadioButton duration_chosen; - Gtk::RadioButtonGroup choice_group; - Gtk::RadioButton percent_chosen; + bool ignore_adjustment_change; + bool ignore_clock_change; + sigc::connection update_connection; + float progress; + void update_progress_gui (float); + void duration_clock_changed (); + void duration_adjustment_changed (); + void timer_update (); }; #endif /* __ardour_time_fx_dialog_h__ */ -- cgit v1.2.3