Adjust how macOS drives are analysed and add a couple of tests.

[dcpomatic.git] / src / lib / cross.h

diff --git a/src/lib/cross.h b/src/lib/cross.h
index a53e85a2de3560d5a886c1b8834c099e2d459196..aad223d60fd4d392310124e07ff2192cfdbdc4c7 100644 (file)
--- 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)
@@ -63,18 +62,16 @@ 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.
@@ -142,4 +139,28 @@ 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);
+
+
 #endif