Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

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

diff --git a/src/lib/cross.h b/src/lib/cross.h
index cd0372338fc062ec3e5a4fce4a631f52f119b0d1..4067631bcf134a2200ae04b961ae4d609b7e1cba 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -37,7 +37,7 @@
 class Log;
 struct AVIOContext;
 
-void dcpomatic_sleep (int);
+void dcpomatic_sleep_seconds (int);
 extern std::string cpu_info ();
 extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path);
 extern std::list<std::pair<std::string, std::string> > mount_info ();
@@ -55,6 +55,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.