X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.cc;h=29591c69f251cc9fd65de945e2e4e80ceab7f3be;hb=edecc975384bfef50418e3fb77e5c4629207ec08;hp=9aa8454c989444dd04532a4b9ef995c36c279b20;hpb=a9dd3d27bc52f853309885b1be02d6efd2d2af48;p=dcpomatic.git

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 9aa8454c9..29591c69f 100644
--- 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-2015 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
@@ -17,11 +17,11 @@
 
 */
 
-#include <fstream>
-#include <boost/algorithm/string.hpp>
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
+#include "exceptions.h"
+#include <boost/algorithm/string.hpp>
 #ifdef DCPOMATIC_LINUX
 #include <unistd.h>
 #include <mntent.h>
@@ -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>
@@ -41,7 +42,13 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
-#include "exceptions.h"
+#include <fstream>
+
+#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);
+#define LOG_ERROR_NC(...) log->log (__VA_ARGS__, Log::TYPE_ERROR);
 
 using std::pair;
 using std::list;
@@ -70,6 +77,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;
@@ -141,6 +151,30 @@ app_contents ()
 }
 #endif
 
+boost::filesystem::path
+shared_path ()
+{
+#ifdef DCPOMATIC_LINUX
+#ifdef DCPOMATIC_DEBUG
+	char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
+	if (p) {
+		return p;
+	}
+#endif
+	return boost::filesystem::canonical (LINUX_SHARE_PREFIX);
+#endif
+#ifdef DCPOMATIC_WINDOWS
+	wchar_t dir[512];
+	GetModuleFileName (GetModuleHandle (0), dir, sizeof (dir));
+	PathRemoveFileSpec (dir);
+	boost::filesystem::path path = dir;
+	return path.parent_path();
+#endif
+#ifdef DCPOMATIC_OSX
+	return app_contents();
+#endif	
+}
+
 void
 run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, shared_ptr<Log> log)
 {
@@ -153,7 +187,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 	HANDLE child_stderr_read;
 	HANDLE child_stderr_write;
 	if (!CreatePipe (&child_stderr_read, &child_stderr_write, &security, 0)) {
-		log->log ("ffprobe call failed (could not CreatePipe)");
+		LOG_ERROR_NC ("ffprobe call failed (could not CreatePipe)");
 		return;
 	}
 
@@ -180,19 +214,19 @@ 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_NC (N_("ffprobe call failed (could not CreateProcess)"));
 		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)");
+		LOG_ERROR_NC (N_("ffprobe call failed (could not create output file)"));
 		return;
 	}
 
 	CloseHandle (child_stderr_write);
 
-	while (1) {
+	while (true) {
 		char buffer[512];
 		DWORD read;
 		if (!ReadFile(child_stderr_read, buffer, sizeof(buffer), &read, 0) || read == 0) {
@@ -211,7 +245,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
 
@@ -221,7 +255,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
 }
@@ -237,7 +271,7 @@ mount_info ()
 		return m;
 	}
 	
-	while (1) {
+	while (true) {
 		struct mntent* mnt = getmntent (f);
 		if (!mnt) {
 			break;
@@ -285,3 +319,38 @@ fopen_boost (boost::filesystem::path p, string t)
         return fopen (p.c_str(), t.c_str ());
 #endif
 }
+
+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	
+}
+
+void
+Waker::nudge ()
+{
+#ifdef DCPOMATIC_WINDOWS
+	SetThreadExecutionState (ES_SYSTEM_REQUIRED);
+#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	
+}