projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up careful_string_filter and add some extra transliterations.
[dcpomatic.git]
/
src
/
lib
/
cross.h
diff --git
a/src/lib/cross.h
b/src/lib/cross.h
index 83cda4a04b41d723572ea43b890558d5dba048ca..4be121d2bb1daec1e46451366e26621ecef7ca63 100644
(file)
--- a/
src/lib/cross.h
+++ b/
src/lib/cross.h
@@
-54,8
+54,6
@@
extern void maybe_open_console ();
#endif
extern boost::filesystem::path resources_path ();
extern boost::filesystem::path libdcp_resources_path ();
#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 ();
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<std::string> version);
extern boost::filesystem::path directory_containing_executable ();
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 ();
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<OSXMediaPath> analyse_osx_media_path (std::string path);
std::vector<Drive> osx_disks_to_drives (std::vector<OSXDisk> disks);
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
#endif