X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=584fa2b426a7f2fab9460205edbd47cd2395bf8f;hp=f1af03346d5253ace206a45dc17b5a957e101901;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=4513308f3c08579d53a0eee91b470dca3a28cbc2

diff --git a/src/lib/cross.h b/src/lib/cross.h
index f1af03346..584fa2b42 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -29,6 +29,7 @@
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #endif
 #include <boost/filesystem.hpp>
+#include <boost/thread/mutex.hpp>
 
 #ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
@@ -37,9 +38,10 @@
 class Log;
 struct AVIOContext;
 
-void dcpomatic_sleep (int);
+void dcpomatic_sleep_seconds (int);
+void dcpomatic_sleep_milliseconds (int);
 extern std::string cpu_info ();
-extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path, boost::shared_ptr<Log>);
+extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path);
 extern std::list<std::pair<std::string, std::string> > mount_info ();
 extern boost::filesystem::path openssl_path ();
 #ifdef DCPOMATIC_OSX
@@ -55,6 +57,9 @@ extern void start_batch_converter (boost::filesystem::path dcpomatic);
 extern void start_player (boost::filesystem::path dcpomatic);
 extern uint64_t thread_id ();
 extern int avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags);
+extern boost::filesystem::path home_directory ();
+extern std::string command_and_read (std::string cmd);
+extern bool running_32_on_64 ();
 
 /** @class Waker
  *  @brief A class which tries to keep the computer awake on various operating systems.
@@ -71,6 +76,7 @@ public:
 	void nudge ();
 
 private:
+	boost::mutex _mutex;
 #ifdef DCPOMATIC_OSX
 	IOPMAssertionID _assertion_id;
 #endif