X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=d8296e21735923088c90a91e3b47c3b8db5d3ebd;hp=6956b8efa926e25027db39e354b997346a5dbdcf;hb=463496994d770577ff1e1ea6e7b1e4addb4252b2;hpb=8e96f8c1677146d224438ec040982532879d6c34

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 6956b8efa..d8296e217 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,31 +29,56 @@
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #endif
 #include <boost/filesystem.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/optional.hpp>
+#include <boost/function.hpp>
 
 #ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
 #endif
 
 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_DISK
+extern boost::filesystem::path disk_writer_path ();
+#endif
 #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 ();
+extern void unprivileged ();
+extern boost::filesystem::path config_path ();
+
+class PrivilegeEscalator
+{
+public:
+	PrivilegeEscalator ();
+	~PrivilegeEscalator ();
+};
 
 /** @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
@@ -65,9 +90,57 @@ public:
 	void nudge ();
 
 private:
+	boost::mutex _mutex;
 #ifdef DCPOMATIC_OSX
 	IOPMAssertionID _assertion_id;
 #endif
 };
 
+class Drive
+{
+public:
+	Drive (std::string device, std::vector<boost::filesystem::path> mount_points, uint64_t size, boost::optional<std::string> vendor, boost::optional<std::string> model)
+		: _device(device)
+		, _mount_points(mount_points)
+		, _size(size)
+		, _vendor(vendor)
+		, _model(model)
+	{}
+
+	explicit Drive (std::string);
+
+	std::string as_xml () const;
+
+	std::string description () const;
+
+	std::string device () const {
+		return _device;
+	}
+
+	std::string device_for_write () const;
+
+	bool mounted () const {
+		return !_mount_points.empty();
+	}
+
+	std::string log_summary () const;
+
+	/** Unmount any mounted partitions on a drive.
+	 *  @return true on success, false on failure.
+	 */
+	bool unmount ();
+
+	static std::vector<Drive> get ();
+
+private:
+	std::string _device;
+	std::vector<boost::filesystem::path> _mount_points;
+	/** size in bytes */
+	uint64_t _size;
+	boost::optional<std::string> _vendor;
+	boost::optional<std::string> _model;
+};
+
+void disk_write_finished ();
+
 #endif