Try to fix clashes caused by ERROR, WARNING etc. as variables.

[dcpomatic.git] / src / lib / cross.cc

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 9f7a761248aef9f045ba85a14e05356a066b5a4b..730cfe1d0f46a8457652d29cfbad0b0e64a9ae9d 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -34,6 +34,7 @@
 #ifdef DCPOMATIC_OSX
 #include <sys/sysctl.h>
 #include <mach-o/dyld.h>
+#include <IOKit/pwr_mgt/IOPMLib.h>
 #endif
 #ifdef DCPOMATIC_POSIX
 #include <sys/types.h>
@@ -43,6 +44,11 @@
 #endif
 #include "exceptions.h"
 
+#include "i18n.h"
+
+#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_ERROR(...) log->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
+
 using std::pair;
 using std::list;
 using std::ifstream;
@@ -183,13 +189,13 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
        PROCESS_INFORMATION process_info;
        ZeroMemory (&process_info, sizeof (process_info));
        if (!CreateProcess (0, command, 0, 0, TRUE, CREATE_NO_WINDOW, 0, 0, &startup_info, &process_info)) {
-               log->log ("ffprobe call failed (could not CreateProcess)");
+               LOG_ERROR (N_("ffprobe call failed (could not CreateProcess)"));
                return;
        }
 
        FILE* o = fopen_boost (out, "w");
        if (!o) {
-               log->log ("ffprobe call failed (could not create output file)");
+               LOG_ERROR (N_("ffprobe call failed (could not create output file)"));
                return;
        }
 
@@ -214,7 +220,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 
 #ifdef DCPOMATIC_LINUX 
        string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\"";
-       log->log (String::compose ("Probing with %1", ffprobe));
+       LOG_GENERAL (N_("Probing with %1"), ffprobe);
         system (ffprobe.c_str ());
 #endif
 
@@ -224,7 +230,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
        path /= "ffprobe";
        
        string ffprobe = path.string() + " \"" + content.string() + "\" 2> \"" + out.string() + "\"";
-       log->log (String::compose ("Probing with %1", ffprobe));
+       LOG_GENERAL (N_("Probing with %1"), ffprobe);
        system (ffprobe.c_str ());
 #endif
 }
@@ -300,9 +306,26 @@ dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
 }
 
 void
-kick ()
+Waker::nudge ()
 {
 #ifdef DCPOMATIC_WINDOWS
        SetThreadExecutionState (ES_CONTINUOUS);
 #endif 
 }
+
+Waker::Waker ()
+{
+#ifdef DCPOMATIC_OSX
+       /* We should use this */
+        // IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id);
+       /* but it's not available on 10.5, so we use this */
+        IOPMAssertionCreate (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &_assertion_id);
+#endif 
+}
+
+Waker::~Waker ()
+{
+#ifdef DCPOMATIC_OSX   
+       IOPMAssertionRelease (_assertion_id);
+#endif 
+}