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 ece36fe252aef51da20217295dcba7ad6211b1b7..aad223d60fd4d392310124e07ff2192cfdbdc4c7 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -39,40 +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 ();
 #endif
-#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.
@@ -138,4 +137,30 @@ private:
        boost::optional<std::string> _model;
 };
 
+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