Various OSX warnings fixes.

[dcpomatic.git] / src / tools / dcpomatic_disk.cc

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index b23f09d85ac9223f27e390987888c4ac7ea8b9fa..55f2bd4401a0461aa4ba874efc3ee7ecd2784ad3 100644 (file)
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -41,7 +41,6 @@
 #include <boost/process/windows.hpp>
 #endif
 #ifdef DCPOMATIC_OSX
-#include <ApplicationServices/ApplicationServices.h>
 #include <notify.h>
 #endif
 
@@ -130,8 +129,12 @@ public:
 #endif
 
 #ifdef DCPOMATIC_LINUX
-               LOG_DISK("Starting writer process %1", disk_writer_path().string());
-               _writer = new boost::process::child (disk_writer_path());
+               if (getenv("DCPOMATIC_NO_START_WRITER")) {
+                       LOG_DISK_NC("Not starting writer process as DCPOMATIC_NO_START_WRITER is set");
+               } else {
+                       LOG_DISK("Starting writer process %1", disk_writer_path().string());
+                       _writer = new boost::process::child (disk_writer_path());
+               }
 #endif
 
 #ifdef DCPOMATIC_OSX
@@ -313,10 +316,8 @@ public:
                        unsetenv ("UBUNTU_MENUPROXY");
 #endif
 
-#ifdef __WXOSX__
-                       ProcessSerialNumber serial;
-                       GetCurrentProcess (&serial);
-                       TransformProcessType (&serial, kProcessTransformToForegroundApplication);
+#ifdef DCPOMATIC_OSX
+                       make_foreground_application ();
 #endif
 
                        dcpomatic_setup_path_encoding ();