X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=4be121d2bb1daec1e46451366e26621ecef7ca63;hp=64cb2e6b83f5bb8952fb1d2c4c10d629e7515385;hb=bbe336ee97c86c424f8f94e0f947f8e3b20e7123;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 64cb2e6b8..4be121d2b 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -31,7 +31,6 @@
 #include <boost/filesystem.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/optional.hpp>
-#include <boost/function.hpp>
 
 #ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
@@ -44,7 +43,7 @@ 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 std::list<std::pair<std::string, std::string>> mount_info ();
 extern boost::filesystem::path openssl_path ();
 extern void make_foreground_application ();
 #ifdef DCPOMATIC_DISK
@@ -53,26 +52,22 @@ extern boost::filesystem::path disk_writer_path ();
 #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 boost::filesystem::path resources_path ();
+extern boost::filesystem::path libdcp_resources_path ();
 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 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.
@@ -140,4 +135,51 @@ private:
 
 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);
+
+
+class ArgFixer
+{
+public:
+	ArgFixer(int argc, char** argv);
+
+	int argc() const {
+		return _argc;
+	}
+
+	char** argv() const {
+		 return _argv;
+	}
+
+private:
+	int _argc;
+	char** _argv;
+#ifdef DCPOMATIC_WINDOWS
+	std::vector<std::string> _argv_strings;
+#endif
+
+};
+
+
 #endif