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 ac1f028f443a33d9c5864b9329bbf12ed468edcc..aad223d60fd4d392310124e07ff2192cfdbdc4c7 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -142,19 +142,17 @@ void disk_write_finished ();
 
 struct OSXMediaPath
 {
-       bool real;       ///< true for a "real" disk, false for a synthesized APFS one
-       std::string prt; ///< "PRT" entry from the media path
+       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 mount_point;
+       std::string device;
        boost::optional<std::string> vendor;
        boost::optional<std::string> model;
-       bool real;
-       std::string prt;
+       OSXMediaPath media_path;
        bool whole;
        std::vector<boost::filesystem::path> mount_points;
        unsigned long size;