'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS...

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 27de9d59237e15dd637a5bb80fa7e078b23a447c..5f3ef2d31db9a65ea31de0d0cecd7305cd7fa351 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -27,7 +27,7 @@
 #include <cerrno>
 #include <fstream>
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
 #include <sys/resource.h>
 #endif
 
@@ -834,7 +834,7 @@ ARDOUR_UI::no_memory_warning ()
 void
 ARDOUR_UI::check_memory_locking ()
 {
-#if defined(__APPLE__) || defined(WIN32)
+#if defined(__APPLE__) || defined(PLATFORM_WINDOWS)
        /* OS X doesn't support mlockall(2), and so testing for memory locking capability there is pointless */
        return;
 #else // !__APPLE__
@@ -3367,7 +3367,7 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
                        warning << _("Specified docroot is not an existing directory.") << endmsg;
                        continue;
                }
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
                if ( (!g_lstat (icsd_exec.c_str(), &sb) == 0)
                     || (sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0 ) {
                        warning << _("Given Video Server is not an executable file.") << endmsg;
@@ -3816,7 +3816,7 @@ ARDOUR_UI::reconnect_to_engine ()
 {
        if (AudioEngine::instance()->start ()) {
                MessageDialog msg (*editor,  _("Could not reconnect to the Audio/MIDI engine"));
-               msg.run ();
+               msg.run (); 
                return -1;
        }
        

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index 03d3e472640e4204ee8c00fce2619f34e633a2a6..730cd99b37cf2cb8c9f700930bf096a1dd4300fd 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -54,7 +54,7 @@ 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 WIN32
+#ifndef PLATFORM_WINDOWS
        , _peak_channel (false)
 #endif
 {
@@ -138,7 +138,7 @@ AudioRegionEditor::gain_adjustment_changed ()
 void
 AudioRegionEditor::signal_peak_thread ()
 {
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        m_peak_sem.post ();
 #else
        _peak_channel.deliver ('c');
@@ -148,7 +148,7 @@ AudioRegionEditor::signal_peak_thread ()
 void
 AudioRegionEditor::wait_for_signal ()
 {
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        m_peak_sem.wait ();
 #else
        char msg;

diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h
index 2552dfd16503ed7512ad6899ab6a975d154158e1..3fdecc18379e71cd8ed5d8fdc6cd7dd6e799531f 100644 (file)
--- a/gtk2_ardour/audio_region_editor.h
+++ b/gtk2_ardour/audio_region_editor.h
@@ -36,7 +36,7 @@
 
 
 #include "pbd/signals.h"
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
 #include "pbd/glib_semaphore.h"
 #else
 #include "pbd/crossthread.h"
@@ -83,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;