X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=bdcae353786103146d40f632c7d6e6a096193c73;hb=87df63f0ca9cf1df4f99f5818dad45bbc4c6e3e3;hp=64cb2e6b83f5bb8952fb1d2c4c10d629e7515385;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 64cb2e6b8..bdcae3537 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -53,7 +53,9 @@ extern boost::filesystem::path disk_writer_path ();
 #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 ();
@@ -61,17 +63,22 @@ 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 directory_containing_executable ();
+extern boost::filesystem::path fix_long_path (boost::filesystem::path path);
+namespace dcpomatic {
+	std::string get_process_id ();
+}
 
 class PrivilegeEscalator
 {
 public:
 	PrivilegeEscalator ();
 	~PrivilegeEscalator ();
+
+	static bool test;
 };
 
 /** @class Waker