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

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index e43dae9e2b4cf2efe3f6e4fed88f0453300ccb84..7692a7b0216c29d06584318c36332755d664aebb 100644 (file)
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -402,7 +402,7 @@ Editor::timefx_thread (void *arg)
            by the GUI ...
         */
 
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        Sleep(2000);
 #else
         struct timespec t = { 2, 0 };

diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 8b7ad865c725f5889fe0b0c0338950b6e6017f4c..7e84cab1227472c4399805ee4fb5e5c558ff2b4f 100644 (file)
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -688,7 +688,7 @@ ExportVideoDialog::encode_pass (int pass)
                ffs["-an"] = "-y";
                ffs["-passlogfile"] =  Glib::path_get_dirname (outfn) + G_DIR_SEPARATOR + "ffmpeg2pass";
                ffs["-f"] = get_file_extension(invid).empty()?"mov":get_file_extension(invid);
-#ifdef _OS_WIN32
+#ifdef PLATFORM_WINDOWS
                outfn = "NUL";
 #else
                outfn = "/dev/null";

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index da2677b296b4672e76e76fa3623ff5457989d6f5..b9f3040ea08bfcb97b2382aa61277c59b7a12bd5 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -506,7 +506,7 @@ int main (int argc, char *argv[])
                return curvetest (curvetest_file);
        }
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        if (::signal (SIGPIPE, sigpipe_handler)) {
                cerr << _("Cannot xinstall SIGPIPE error handler") << endl;
        }

diff --git a/gtk2_ardour/pingback.cc b/gtk2_ardour/pingback.cc
index ccec81cba7a70164d93728cd5a36e21c7e97470f..62d9191daf09c3983579d69656aaedd1b71b424f 100644 (file)
--- a/gtk2_ardour/pingback.cc
+++ b/gtk2_ardour/pingback.cc
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <cstring>
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
 #include <sys/utsname.h>
 #endif
 
@@ -73,7 +73,7 @@ struct ping_call {
 static void*
 _pingback (void *arg)
 {
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        ping_call* cm = static_cast<ping_call*> (arg);
        CURL* c;
        struct utsname utb;
@@ -162,7 +162,7 @@ _pingback (void *arg)
        curl_easy_cleanup (c);
        delete cm;
 
-#endif /* WIN32 */
+#endif /* PLATFORM_WINDOWS */
 
        return 0;
 }

diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc
index 8e57d9a0c44bab7b7702047202485b89ef5086a4..e1501460cadd682e0c762c58d1cc78b0b29c7a72 100644 (file)
--- a/gtk2_ardour/sfdb_freesound_mootcher.cc
+++ b/gtk2_ardour/sfdb_freesound_mootcher.cc
@@ -91,7 +91,7 @@ void Mootcher::ensureWorkingDir ()
                }\r
        }\r
        basePath = p;\r
-#ifdef __WIN32__\r
+#ifdef PLATFORM_WINDOWS\r
        std::string replace = "/";\r
        size_t pos = basePath.find("\\");\r
        while( pos != std::string::npos ){\r

diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 98df970e391a699f1e8e9574ea6cad596c9bab35..74a4d7d840318f498e185fcef8742dab51b1236d 100644 (file)
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -1459,7 +1459,7 @@ SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool&
 bool
 SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths)
 {
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        return false;
 #else
        std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));

diff --git a/gtk2_ardour/system_exec.cc b/gtk2_ardour/system_exec.cc
index 59f3647e51fc703f5fa75a6bc84a65b0807b84a9..46b011171d2d00dadbe3520c6f85f513303e0ae5 100644 (file)
--- a/gtk2_ardour/system_exec.cc
+++ b/gtk2_ardour/system_exec.cc
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <dirent.h>
 
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
 #include <windows.h>
 #else
 #include <fcntl.h>
@@ -47,7 +47,7 @@ void * interposer_thread (void *arg);
 
 static void close_fd (int& fd) { if (fd >= 0) ::close (fd); fd = -1; }
 
-#ifndef __WIN32__
+#ifndef PLATFORM_WINDOWS
 /*
  * This function was part of libasyncns.
  * LGPL v2.1
@@ -155,7 +155,7 @@ SystemExec::SystemExec (std::string c, std::string a)
        nicelevel = 0;
        envp = NULL;
        argp = NULL;
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
        stdinP[0] = stdinP[1] = INVALID_HANDLE_VALUE;
        stdoutP[0] = stdoutP[1] = INVALID_HANDLE_VALUE;
        stderrP[0] = stderrP[1] = INVALID_HANDLE_VALUE;
@@ -173,7 +173,7 @@ SystemExec::SystemExec (std::string c, char **a)
        pin[1] = -1;
        nicelevel = 0;
        envp = NULL;
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
        stdinP[0] = stdinP[1] = INVALID_HANDLE_VALUE;
        stdoutP[0] = stdoutP[1] = INVALID_HANDLE_VALUE;
        stderrP[0] = stderrP[1] = INVALID_HANDLE_VALUE;
@@ -197,7 +197,7 @@ SystemExec::~SystemExec ()
                }
                free (argp);
        }
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
        if (w_args) free(w_args);
 #endif
        pthread_mutex_destroy(&write_lock);
@@ -211,7 +211,7 @@ interposer_thread (void *arg) {
        return 0;
 }
 
-#ifdef __WIN32__ /* Windows Process */
+#ifdef PLATFORM_WINDOWS /* Windows Process */
 
 /* HELPER FUNCTIONS */
 

diff --git a/gtk2_ardour/system_exec.h b/gtk2_ardour/system_exec.h
index cf8518f547a9e506d0b1aac1a4c94b564c52b6e7..38589bb26fbe002492360c789f5d2fc09d74478c 100644 (file)
--- a/gtk2_ardour/system_exec.h
+++ b/gtk2_ardour/system_exec.h
@@ -177,7 +177,7 @@ class SystemExec
                char **envp;
 
        private:
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
                PROCESS_INFORMATION *pid;
                HANDLE stdinP[2];
                HANDLE stdoutP[2];

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 0f81f4bda68fc04f16c75482b117fcdc2f604843..0a622cb690c9f88f7963121c77be2b201b6633c9 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -505,7 +505,7 @@ TranscodeFfmpeg::cancel ()
 {
        if (!ffcmd || !ffcmd->is_running()) { return;}
        ffcmd->write_to_stdin("q");
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
        Sleep(1000);
 #else
        sleep (1);

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 00e94b0dd96b6878584162b1eeb119d7567a8b7c..777eb6261650bc3c42eec0b58501b343b3e65520 100644 (file)
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -741,7 +741,7 @@ set_pango_fontsize ()
 
        /* FT2 rendering - used by GnomeCanvas, sigh */
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
        pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024);
 #endif