X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=4be121d2bb1daec1e46451366e26621ecef7ca63;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hp=99c6bc29979c3a938c2a91b40f858c2d6a49e3b4;hpb=47d83b296248119d04b9226fd51a67e2fd3faac5;p=dcpomatic.git diff --git a/src/lib/cross.h b/src/lib/cross.h index 99c6bc299..4be121d2b 100644 --- a/src/lib/cross.h +++ b/src/lib/cross.h @@ -43,7 +43,7 @@ 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 > mount_info (); +extern std::list> mount_info (); extern boost::filesystem::path openssl_path (); extern void make_foreground_application (); #ifdef DCPOMATIC_DISK @@ -54,8 +54,6 @@ extern void maybe_open_console (); #endif extern boost::filesystem::path resources_path (); extern boost::filesystem::path libdcp_resources_path (); -extern FILE * fopen_boost (boost::filesystem::path, std::string); -extern int dcpomatic_fseek (FILE *, int64_t, int); extern void start_batch_converter (); extern void start_player (); extern uint64_t thread_id (); @@ -65,7 +63,6 @@ extern bool running_32_on_64 (); extern void unprivileged (); extern boost::filesystem::path config_path (boost::optional 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 (); @@ -162,4 +159,27 @@ boost::optional analyse_osx_media_path (std::string path); std::vector osx_disks_to_drives (std::vector 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 _argv_strings; +#endif + +}; + + #endif