X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=cc066488a9b4cac9312cbeb84b2a797566139222;hb=152197adf5b060602ecdd99e6f272c4e8b2b410e;hp=d8296e21735923088c90a91e3b47c3b8db5d3ebd;hpb=13f302149a2a2846d801689e3d194af3249ed0b7;p=dcpomatic.git

diff --git a/src/lib/cross.h b/src/lib/cross.h
index d8296e217..cc066488a 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -40,39 +40,44 @@
 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 directory_containing_executable ();
+namespace dcpomatic {
+	std::string get_process_id ();
+}
 
 class PrivilegeEscalator
 {
 public:
 	PrivilegeEscalator ();
 	~PrivilegeEscalator ();
+
+	static bool test;
 };
 
 /** @class Waker
@@ -117,8 +122,6 @@ public:
 		return _device;
 	}
 
-	std::string device_for_write () const;
-
 	bool mounted () const {
 		return !_mount_points.empty();
 	}