Merge branch 'master' 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 f3accaf1152d85119a0acd36a640ab072108a142..0d9292b483d84e16ebb30823a2e9c2377355d302 100644 (file)
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -37,6 +37,11 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 
 #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"
@@ -56,14 +61,14 @@ class AudioRegionEditor : public RegionEditor
        ~AudioRegionEditor ();
 
        void peak_amplitude_thread ();
-       
+
   private:
 
        void region_changed (PBD::PropertyChange const &);
-       
+
        void gain_changed ();
        void gain_adjustment_changed ();
-       
+
        boost::shared_ptr<ARDOUR::AudioRegion> _audio_region;
 
        Gtk::Label gain_label;
@@ -73,11 +78,17 @@ class AudioRegionEditor : public RegionEditor
        Gtk::Label _peak_amplitude_label;
        Gtk::Entry _peak_amplitude;
 
-       bool _peak_amplitude_found;
+       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__ */