Merge master.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 45c38da2bbc2aedea59bc8b2103f0693f0685c04..eadbd75d87d1c203ea7a4a2719079a4da81fbb83 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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>
@@ -70,6 +71,9 @@ cpu_info ()
        string info;
        
 #ifdef DCPOMATIC_LINUX
+       /* This use of ifstream is ok; the filename can never
+          be non-Latin
+       */
        ifstream f ("/proc/cpuinfo");
        while (f.good ()) {
                string l;
@@ -184,7 +188,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
                return;
        }
 
-       FILE* o = fopen (out.string().c_str(), "w");
+       FILE* o = fopen_boost (out, "w");
        if (!o) {
                log->log ("ffprobe call failed (could not create output file)");
                return;
@@ -270,27 +274,53 @@ openssl_path ()
 
 }
 
-list<string>
-network_interfaces ()
+/* Apparently there is no way to create an ofstream using a UTF-8
+   filename under Windows.  We are hence reduced to using fopen
+   with this wrapper.
+*/
+FILE *
+fopen_boost (boost::filesystem::path p, string t)
 {
-       list<string> interfaces;
-       
-#ifdef DCPOMATIC_POSIX
-       struct ifaddrs* addresses = 0;
+#ifdef DCPOMATIC_WINDOWS
+        wstring w (t.begin(), t.end());
+       /* c_str() here should give a UTF-16 string */
+        return _wfopen (p.c_str(), w.c_str ());
+#else
+        return fopen (p.c_str(), t.c_str ());
+#endif
+}
 
-       getifaddrs (&addresses);
+int
+dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
+{
+#ifdef DCPOMATIC_WINDOWS
+       return _fseeki64 (stream, offset, whence);
+#else  
+       return fseek (stream, offset, whence);
+#endif 
+}
 
-       for (struct ifaddrs* i = addresses; i; i = i->ifa_next) {
-               if (i->ifa_addr->sa_family == AF_INET) {
-                       void* p = &((struct sockaddr_in *) i->ifa_addr)->sin_addr;
-                       char b[INET_ADDRSTRLEN];
-                       inet_ntop (AF_INET, p, b, INET_ADDRSTRLEN);
-                       interfaces.push_back (b);
-               }
-       }
+void
+Waker::nudge ()
+{
+#ifdef DCPOMATIC_WINDOWS
+       SetThreadExecutionState (ES_CONTINUOUS);
+#endif 
+}
 
-       freeifaddrs (addresses);
-#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 
+}
 
-       return interfaces;
+Waker::~Waker ()
+{
+#ifdef DCPOMATIC_OSX   
+       IOPMAssertionRelease (_assertion_id);
+#endif 
 }