Merge master.

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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 124697fb446aca92ad5e89c490a67f7b51a51fd9..ee0ef89b2ea0c9394b53124b700605d5c703a3af 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -22,16 +22,16 @@
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
-#ifdef DVDOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
 #include <unistd.h>
 #include <mntent.h>
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #include <windows.h>
 #undef DATADIR
 #include <shlwapi.h>
 #endif
-#ifdef DVDOMATIC_OSX
+#ifdef DCPOMATIC_OSX
 #include <sys/sysctl.h>
 #endif
 
@@ -43,12 +43,12 @@ using std::make_pair;
 using boost::shared_ptr;
 
 void
-dvdomatic_sleep (int s)
+dcpomatic_sleep (int s)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
        sleep (s);
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
        Sleep (s * 1000);
 #endif
 }
@@ -60,7 +60,7 @@ cpu_info ()
        pair<string, int> info;
        info.second = 0;
        
-#ifdef DVDOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
        ifstream f ("/proc/cpuinfo");
        while (f.good ()) {
                string l;
@@ -76,7 +76,7 @@ cpu_info ()
        }
 #endif
 
-#ifdef DVDOMATIC_OSX
+#ifdef DCPOMATIC_OSX
        size_t N = sizeof (info.second);
        sysctlbyname ("hw.ncpu", &info.second, &N, 0, 0);
        char buffer[64];
@@ -92,7 +92,7 @@ cpu_info ()
 void
 run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, shared_ptr<Log> log)
 {
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
        SECURITY_ATTRIBUTES security;
        security.nLength = sizeof (security);
        security.bInheritHandle = TRUE;
@@ -167,7 +167,7 @@ mount_info ()
 {
        list<pair<string, string> > m;
        
-#ifdef DVDOMATIC_LINUX
+#ifdef DCPOMATIC_LINUX
        FILE* f = setmntent ("/etc/mtab", "r");
        if (!f) {
                return m;