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
extern void maybe_open_console ();
#endif
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 boost::filesystem::path libdcp_resources_path ();
extern void start_batch_converter ();
extern void start_player ();
extern uint64_t thread_id ();
extern void unprivileged ();
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 ();
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;
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