Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / gtk2_ardour / editor_timefx.cc

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 34c974e102c1b8407eb9ed80b1dde12df4bcccab..e43dae9e2b4cf2efe3f6e4fed88f0453300ccb84 100644 (file)
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -37,14 +37,12 @@
 #include "region_selection.h"
 #include "time_fx_dialog.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"
+#include "ardour/region.h"
+#include "ardour/session.h"
+#include "ardour/stretch.h"
 
 #ifdef USE_RUBBERBAND
 #include "rubberband/RubberBandStretcher.h"
@@ -310,6 +308,8 @@ Editor::time_fx (RegionList& regions, float val, bool pitching)
                gtk_main_iteration ();
        }
 
+       pthread_join (current_timefx->request.thread, 0);
+
        current_timefx->hide ();
        return current_timefx->status;
 }
@@ -402,9 +402,12 @@ Editor::timefx_thread (void *arg)
            by the GUI ...
         */
 
+#ifdef WIN32
+       Sleep(2000);
+#else
         struct timespec t = { 2, 0 };
         nanosleep (&t, 0);
-
+#endif
        return 0;
 }