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

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index a7fb298cb..5d35d5a4b 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -65,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);
@@ -75,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 ()
@@ -300,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
 
 }
@@ -337,6 +356,7 @@ void
 Waker::nudge ()
 {
 #ifdef DCPOMATIC_WINDOWS
+	boost::mutex::scoped_lock lm (_mutex);
 	SetThreadExecutionState (ES_SYSTEM_REQUIRED);
 #endif
 }
@@ -344,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 */
@@ -354,6 +375,7 @@ Waker::Waker ()
 Waker::~Waker ()
 {
 #ifdef DCPOMATIC_OSX
+	boost::mutex::scoped_lock lm (_mutex);
 	IOPMAssertionRelease (_assertion_id);
 #endif
 }