Merge branch 'master' into cairocanvas

[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 0d9292b483d84e16ebb30823a2e9c2377355d302..3fdecc18379e71cd8ed5d8fdc6cd7dd6e799531f 100644 (file)
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -34,10 +34,9 @@
 #include <gtkmm/separator.h>
 #include <gtkmm/spinbutton.h>
 
-#include <libgnomecanvas/libgnomecanvas.h>
 
 #include "pbd/signals.h"
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
 #include "pbd/glib_semaphore.h"
 #else
 #include "pbd/crossthread.h"
@@ -84,7 +83,7 @@ class AudioRegionEditor : public RegionEditor
        void peak_amplitude_found (double);
        PBD::Signal1<void, double> PeakAmplitudeFound;
        PBD::ScopedConnection _peak_amplitude_connection;
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        PBD::GlibSemaphore m_peak_sem;
 #else
        CrossThreadChannel _peak_channel;