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

[ardour.git] / gtk2_ardour / export_video_dialog.cc

diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 7f6fcc2a8ad80088010e60f392479b48d1f322a4..7e84cab1227472c4399805ee4fb5e5c558ff2b4f 100644 (file)
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -28,7 +28,6 @@
 #include <fcntl.h>
 
 #include <sigc++/bind.h>
-#include <libgen.h>
 
 #include <glib/gstdio.h>
 
@@ -561,7 +560,7 @@ ExportVideoDialog::launch_export ()
                if (gtk_events_pending()) {
                        gtk_main_iteration ();
                } else {
-                       usleep (10000);
+                       Glib::usleep (10000);
                }
        }
        audio_progress_connection.disconnect();
@@ -689,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";