X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=aad223d60fd4d392310124e07ff2192cfdbdc4c7;hp=20bab38a29e7296f8a52130cfd204aa56a417efd;hb=9b9202c7f9fc26fcef0984189aaed366b7c6d726;hpb=a1f7bf2d9e5610075fbd898cdf52f4f8373741f2

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 20bab38a2..aad223d60 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -39,38 +39,39 @@
 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 ();
-#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 boost::filesystem::path resources_path ();
+extern boost::filesystem::path xsd_path ();
+extern boost::filesystem::path tags_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 ();
-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 config_path (boost::optional<std::string> version);
+extern boost::filesystem::path directory_containing_executable ();
+extern boost::filesystem::path fix_long_path (boost::filesystem::path path);
+extern bool show_in_file_manager (boost::filesystem::path dir, boost::filesystem::path select);
+namespace dcpomatic {
+	std::string get_process_id ();
+}
 
-class PrivilegeEscalator
-{
-public:
-	PrivilegeEscalator ();
-	~PrivilegeEscalator ();
-};
 
 /** @class Waker
  *  @brief A class which tries to keep the computer awake on various operating systems.
@@ -96,31 +97,70 @@ 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 ();
+void disk_write_finished ();
+
+
+struct OSXMediaPath
+{
+	bool real; ///< true for a "real" disk, false for a synthesized APFS one
+	std::vector<std::string> parts; ///< parts of the media path after the :
+};
+
+
+struct OSXDisk
+{
+	std::string device;
+	boost::optional<std::string> vendor;
+	boost::optional<std::string> model;
+	OSXMediaPath media_path;
+	bool whole;
+	std::vector<boost::filesystem::path> mount_points;
+	unsigned long size;
+};
+
+
+boost::optional<OSXMediaPath> analyse_osx_media_path (std::string path);
+std::vector<Drive> osx_disks_to_drives (std::vector<OSXDisk> disks);
+
 
 #endif