X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.cc;h=5d35d5a4bbcb28da70ca7b77f0ceec678c1a826e;hp=6dcdbcdc83339d568b2f30f8c078b361a549f2ad;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=154fae5683aa15e84bd07e37f4b219c86354692d

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 6dcdbcdc8..5d35d5a4b 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,6 +21,7 @@
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "config.h"
 #include "exceptions.h"
 extern "C" {
@@ -53,10 +54,6 @@ extern "C" {
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_ERROR(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
-#define LOG_ERROR_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_ERROR);
-
 using std::pair;
 using std::list;
 using std::ifstream;
@@ -68,7 +65,7 @@ using boost::shared_ptr;
 
 /** @param s Number of seconds to sleep for */
 void
-dcpomatic_sleep (int s)
+dcpomatic_sleep_seconds (int s)
 {
 #ifdef DCPOMATIC_POSIX
 	sleep (s);
@@ -78,6 +75,17 @@ dcpomatic_sleep (int s)
 #endif
 }
 
+void
+dcpomatic_sleep_milliseconds (int ms)
+{
+#ifdef DCPOMATIC_POSIX
+	usleep (ms * 1000);
+#endif
+#ifdef DCPOMATIC_WINDOWS
+	Sleep (ms);
+#endif
+}
+
 /** @return A string of CPU information (model name etc.) */
 string
 cpu_info ()
@@ -182,7 +190,7 @@ shared_path ()
 }
 
 void
-run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, shared_ptr<Log> log)
+run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
 {
 #ifdef DCPOMATIC_WINDOWS
 	SECURITY_ATTRIBUTES security;
@@ -303,9 +311,17 @@ openssl_path ()
 	boost::filesystem::path path = dir;
 	path /= "openssl.exe";
 	return path;
-#else
-	/* We assume that it's on the path for Linux and OS X */
-	return "openssl";
+#endif
+
+#ifdef DCPOMATIC_OSX
+	boost::filesystem::path path = app_contents();
+	path /= "MacOS";
+	path /= "openssl";
+	return path;
+#endif
+
+#ifdef DCPOMATIC_LINUX
+	return "dcpomatic2_openssl";
 #endif
 
 }
@@ -340,6 +356,7 @@ void
 Waker::nudge ()
 {
 #ifdef DCPOMATIC_WINDOWS
+	boost::mutex::scoped_lock lm (_mutex);
 	SetThreadExecutionState (ES_SYSTEM_REQUIRED);
 #endif
 }
@@ -347,6 +364,7 @@ Waker::nudge ()
 Waker::Waker ()
 {
 #ifdef DCPOMATIC_OSX
+	boost::mutex::scoped_lock lm (_mutex);
 	/* We should use this */
         // IOPMAssertionCreateWithName (kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR ("Encoding DCP"), &_assertion_id);
 	/* but it's not available on 10.5, so we use this */
@@ -357,15 +375,22 @@ Waker::Waker ()
 Waker::~Waker ()
 {
 #ifdef DCPOMATIC_OSX
+	boost::mutex::scoped_lock lm (_mutex);
 	IOPMAssertionRelease (_assertion_id);
 #endif
 }
 
 void
-start_batch_converter (boost::filesystem::path dcpomatic)
+start_tool (boost::filesystem::path dcpomatic, string executable,
+#ifdef DCPOMATIC_OSX
+	    string app
+#else
+	    string
+#endif
+	)
 {
 #if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_WINDOWS)
-	boost::filesystem::path batch = dcpomatic.parent_path() / "dcpomatic2_batch";
+	boost::filesystem::path batch = dcpomatic.parent_path() / executable;
 #endif
 
 #ifdef DCPOMATIC_OSX
@@ -374,16 +399,15 @@ start_batch_converter (boost::filesystem::path dcpomatic)
 	batch = batch.parent_path (); // Contents
 	batch = batch.parent_path (); // DCP-o-matic.app
 	batch = batch.parent_path (); // Applications
-	batch /= "DCP-o-matic\\ 2\\ Batch\\ Converter.app";
+	batch /= app;
 	batch /= "Contents";
 	batch /= "MacOS";
-	batch /= "dcpomatic2_batch";
+	batch /= executable;
 #endif
 
 #if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
 	pid_t pid = fork ();
 	if (pid == 0) {
-		std::cout << "start " << batch << " from " << dcpomatic << "\n";
 		int const r = system (batch.string().c_str());
 		exit (WEXITSTATUS (r));
 	}
@@ -403,6 +427,18 @@ start_batch_converter (boost::filesystem::path dcpomatic)
 #endif
 }
 
+void
+start_batch_converter (boost::filesystem::path dcpomatic)
+{
+	start_tool (dcpomatic, "dcpomatic2_batch", "DCP-o-matic\\ 2\\ Batch\\ Converter.app");
+}
+
+void
+start_player (boost::filesystem::path dcpomatic)
+{
+	start_tool (dcpomatic, "dcpomatic2_player", "DCP-o-matic\\ 2\\ Player.app");
+}
+
 uint64_t
 thread_id ()
 {
@@ -449,3 +485,54 @@ maybe_open_console ()
 	}
 }
 #endif
+
+boost::filesystem::path
+home_directory ()
+{
+#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+		return getenv("HOME");
+#endif
+#ifdef DCPOMATIC_WINDOWS
+		return boost::filesystem::path(getenv("HOMEDRIVE")) / boost::filesystem::path(getenv("HOMEPATH"));
+#endif
+}
+
+string
+command_and_read (string cmd)
+{
+#ifdef DCPOMATIC_LINUX
+	FILE* pipe = popen (cmd.c_str(), "r");
+	if (!pipe) {
+		throw runtime_error ("popen failed");
+	}
+
+	string result;
+	char buffer[128];
+	try {
+		while (fgets(buffer, sizeof(buffer), pipe)) {
+			result += buffer;
+		}
+	} catch (...) {
+		pclose (pipe);
+		throw;
+	}
+
+	pclose (pipe);
+	return result;
+#endif
+
+	return "";
+}
+
+/** @return true if this process is a 32-bit one running on a 64-bit-capable OS */
+bool
+running_32_on_64 ()
+{
+#ifdef DCPOMATIC_WINDOWS
+	BOOL p;
+	IsWow64Process (GetCurrentProcess(), &p);
+	return p;
+#endif
+	/* XXX: assuming nobody does this on Linux / OS X */
+	return false;
+}