Vorbis Quality Config GUI

[ardour.git] / gtk2_ardour / time_fx_dialog.cc

diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc
index 829ffd6504f372129383e80be2a96431b818a046..c51bdcd5e2b22d7ef04974dd250e4abd303f0a42 100644 (file)
--- a/gtk2_ardour/time_fx_dialog.cc
+++ b/gtk2_ardour/time_fx_dialog.cc
@@ -21,16 +21,17 @@
 #include <iostream>
 #include <cstdlib>
 #include <cmath>
-
 #include <string>
 
+#include <gtkmm/stock.h>
+
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/memento_command.h"
 #include "pbd/unwind.h"
 #include "pbd/stacktrace.h"
 
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/utils.h"
 
 #include "audio_clock.h"
 #include "editor.h"
@@ -45,7 +46,7 @@
 using namespace RubberBand;
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -53,7 +54,7 @@ using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
-TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, framecnt_t oldlen, framecnt_t new_length, framepos_t position)
+TimeFXDialog::TimeFXDialog (Editor& e, bool pitch, samplecnt_t oldlen, samplecnt_t new_length, samplepos_t position)
        : ArdourDialog (X_("time fx dialog"))
        , editor (e)
        , pitching (pitch)
@@ -224,6 +225,11 @@ TimeFXDialog::start_updates ()
 void
 TimeFXDialog::update_progress_gui (float p)
 {
+       /* time/pitch FX are applied in a dedicated thread, so we cannot just
+          update the GUI when notified about progress. That is deferred to a
+          timer-driven callback which will ensure that the visual progress
+          indicator is updated.
+       */
        progress = p;
 }
 
@@ -296,7 +302,7 @@ TimeFXDialog::duration_adjustment_changed ()
 
        PBD::Unwinder<bool> uw (ignore_clock_change, true);
 
-       duration_clock->set ((framecnt_t) (original_length * (duration_adjustment.get_value()/ 100.0)));
+       duration_clock->set ((samplecnt_t) (original_length * (duration_adjustment.get_value()/ 100.0)));
 }
 
 void