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

[ardour.git] / gtk2_ardour / audio_region_editor.h

diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h
index b72986ecf19034387bc5f9564b7a0f97ee0443a0..2552dfd16503ed7512ad6899ab6a975d154158e1 100644 (file)
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -36,7 +36,11 @@
 
 
 #include "pbd/signals.h"
+#ifdef WIN32
+#include "pbd/glib_semaphore.h"
+#else
 #include "pbd/crossthread.h"
+#endif
 
 #include "audio_clock.h"
 #include "ardour_dialog.h"
@@ -73,11 +77,17 @@ class AudioRegionEditor : public RegionEditor
        Gtk::Label _peak_amplitude_label;
        Gtk::Entry _peak_amplitude;
 
+       void signal_peak_thread ();
+       void wait_for_signal ();
        pthread_t _peak_amplitude_thread_handle;
        void peak_amplitude_found (double);
        PBD::Signal1<void, double> PeakAmplitudeFound;
        PBD::ScopedConnection _peak_amplitude_connection;
+#ifdef WIN32
+       PBD::GlibSemaphore m_peak_sem;
+#else
        CrossThreadChannel _peak_channel;
+#endif
 };
 
 #endif /* __gtk_ardour_audio_region_edit_h__ */