X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=aad223d60fd4d392310124e07ff2192cfdbdc4c7;hp=ac1f028f443a33d9c5864b9329bbf12ed468edcc;hb=9b9202c7f9fc26fcef0984189aaed366b7c6d726;hpb=59bb9538218eee564ab3c07f923628e0a47bf207 diff --git a/src/lib/cross.h b/src/lib/cross.h index ac1f028f4..aad223d60 100644 --- 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 parts; ///< parts of the media path after the : }; - struct OSXDisk { - std::string mount_point; + std::string device; boost::optional vendor; boost::optional model; - bool real; - std::string prt; + OSXMediaPath media_path; bool whole; std::vector mount_points; unsigned long size;