diff options
author | Robin Gareus <robin@gareus.org> | 2015-12-02 16:08:53 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-12-02 16:08:53 +0100 |
commit | f5278f60d3e58f9f7680fae18c442b4d7862c4ae (patch) | |
tree | 1a7bbb2e3ba325169a426502506a2044edd5c6a1 | |
parent | 003b632ed1dcc2a07514b23c5a1d992b49fa7baa (diff) |
consolidate semaphore implementation (part two)
-rw-r--r-- | gtk2_ardour/audio_region_editor.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/audio_region_editor.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index 4aa8075942..3446f58eee 100644 --- 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 3fdecc1837..cd525868c9 100644 --- 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 |