X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=4067631bcf134a2200ae04b961ae4d609b7e1cba;hb=f0a2a52ddd1118236d4ce5640339c24bae88aa12;hp=6956b8efa926e25027db39e354b997346a5dbdcf;hpb=f64496a0e94c452caf179cf31722b5808c3e1907;p=dcpomatic.git

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 6956b8efa..4067631bc 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -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.
 
@@ -35,25 +35,34 @@
 #endif
 
 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, 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
 extern boost::filesystem::path app_contents ();
 #endif
+#ifdef DCPOMATIC_WINDOWS
+extern void maybe_open_console ();
+#endif
 extern boost::filesystem::path shared_path ();
 extern FILE * fopen_boost (boost::filesystem::path, std::string);
 extern int dcpomatic_fseek (FILE *, int64_t, int);
 extern void start_batch_converter (boost::filesystem::path dcpomatic);
-extern int thread_id ();
+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.
  *
- *  Create a Waker to prevent sleep, and call ::nudge every so often (every minute or so).
+ *  Create a Waker to prevent sleep, and call nudge() every so often (every minute or so).
  *  Destroy the Waker to allow sleep again.
  */
 class Waker