X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=64cb2e6b83f5bb8952fb1d2c4c10d629e7515385;hb=6eba051dcbb8c56e3e2efea946ce0380d17a7b33;hp=7bbb394a1f87247e5fcbd6030fc829687d16f0a5;hpb=350afcbc40fffd8c8780180e153a2ee91088f562;p=dcpomatic.git

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 7bbb394a1..64cb2e6b8 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -31,6 +31,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/optional.hpp>
+#include <boost/function.hpp>
 
 #ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
@@ -39,26 +40,24 @@
 class Log;
 struct AVIOContext;
 
-void dcpomatic_sleep_seconds (int);
-void dcpomatic_sleep_milliseconds (int);
+extern void dcpomatic_sleep_seconds (int);
+extern void dcpomatic_sleep_milliseconds (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 ();
 extern boost::filesystem::path openssl_path ();
+extern void make_foreground_application ();
 #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 void start_player (boost::filesystem::path dcpomatic);
+extern void start_batch_converter ();
+extern void start_player ();
 extern uint64_t thread_id ();
 extern int avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags);
 extern boost::filesystem::path home_directory ();
@@ -66,6 +65,7 @@ extern std::string command_and_read (std::string cmd);
 extern bool running_32_on_64 ();
 extern void unprivileged ();
 extern boost::filesystem::path config_path ();
+extern boost::filesystem::path directory_containing_executable ();
 
 class PrivilegeEscalator
 {
@@ -98,35 +98,46 @@ private:
 class Drive
 {
 public:
-	Drive (std::string internal_name, uint64_t size, bool mounted, boost::optional<std::string> vendor, boost::optional<std::string> model)
-		: _internal_name(internal_name)
+	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)
-		, _mounted(mounted)
 		, _vendor(vendor)
 		, _model(model)
 	{}
 
+	explicit Drive (std::string);
+
+	std::string as_xml () const;
+
 	std::string description () const;
-	std::string internal_name () const {
-		return _internal_name;
+
+	std::string device () const {
+		return _device;
 	}
+
 	bool mounted () const {
-		return _mounted;
+		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 _internal_name;
+	std::string _device;
+	std::vector<boost::filesystem::path> _mount_points;
 	/** size in bytes */
 	uint64_t _size;
-	bool _mounted;
 	boost::optional<std::string> _vendor;
 	boost::optional<std::string> _model;
 };
 
-std::vector<Drive> get_drives ();
-/** Unmount any mounted partitions on a drive.
- *  @return true on success, false on failure.
- */
-bool unmount_drive (std::string drive);
+void disk_write_finished ();
 
 #endif