consolidate semaphore implementation (part two)

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 4aa807594281f9d0ec99e9cd4dd0ac946b11a8aa..3446f58eeeee56cfe57c88e537995901ac52a96a 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -52,7 +52,9 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
        : RegionEditor (s, r)
        , _audio_region (r)
        , gain_adjustment(accurate_coefficient_to_dB(_audio_region->scale_amplitude()), -40.0, +40.0, 0.1, 1.0, 0)
-#ifndef PLATFORM_WINDOWS
+#ifdef PLATFORM_WINDOWS
+       , m_peak_sem ("peak_semaphore", 0)
+#else
        , _peak_channel (false)
 #endif
 {
@@ -137,7 +139,7 @@ void
 AudioRegionEditor::signal_peak_thread ()
 {
 #ifdef PLATFORM_WINDOWS
-       m_peak_sem.post ();
+       m_peak_sem.signal ();
 #else
        _peak_channel.deliver ('c');
 #endif

diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h
index 3fdecc18379e71cd8ed5d8fdc6cd7dd6e799531f..cd525868c9c52612ef121c6863d831c3a57687e1 100644 (file)
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -37,7 +37,7 @@
 
 #include "pbd/signals.h"
 #ifdef PLATFORM_WINDOWS
-#include "pbd/glib_semaphore.h"
+#include "pbd/semutils.h"
 #else
 #include "pbd/crossthread.h"
 #endif
@@ -84,7 +84,7 @@ class AudioRegionEditor : public RegionEditor
        PBD::Signal1<void, double> PeakAmplitudeFound;
        PBD::ScopedConnection _peak_amplitude_connection;
 #ifdef PLATFORM_WINDOWS
-       PBD::GlibSemaphore m_peak_sem;
+       PBD::ProcessSemaphore m_peak_sem;
 #else
        CrossThreadChannel _peak_channel;
 #endif