projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract part of analyse_media_path to cross_common for tests.
[dcpomatic.git]
/
src
/
lib
/
cross.h
diff --git
a/src/lib/cross.h
b/src/lib/cross.h
index d8f0e56a565ab397092ca6408675fd997890120d..a3d7e13f4e5210e0307f3c78cf2ca2469a12e315 100644
(file)
--- a/
src/lib/cross.h
+++ b/
src/lib/cross.h
@@
-31,7
+31,6
@@
#include <boost/filesystem.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/optional.hpp>
#include <boost/filesystem.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/optional.hpp>
-#include <boost/function.hpp>
#ifdef DCPOMATIC_WINDOWS
#define WEXITSTATUS(w) (w)
#ifdef DCPOMATIC_WINDOWS
#define WEXITSTATUS(w) (w)
@@
-44,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 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 boost::filesystem::path openssl_path ();
extern void make_foreground_application ();
#ifdef DCPOMATIC_DISK
@@
-65,17
+64,14
@@
extern int avio_open_boost (AVIOContext** s, boost::filesystem::path file, int f
extern boost::filesystem::path home_directory ();
extern bool running_32_on_64 ();
extern void unprivileged ();
extern boost::filesystem::path home_directory ();
extern bool running_32_on_64 ();
extern void unprivileged ();
-extern boost::filesystem::path config_path ();
+extern boost::filesystem::path config_path (
boost::optional<std::string> version
);
extern boost::filesystem::path directory_containing_executable ();
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 ();
+}
-class PrivilegeEscalator
-{
-public:
- PrivilegeEscalator ();
- ~PrivilegeEscalator ();
-
- static bool test;
-};
/** @class Waker
* @brief A class which tries to keep the computer awake on various operating systems.
/** @class Waker
* @brief A class which tries to keep the computer awake on various operating systems.
@@
-143,4
+139,15
@@
private:
void disk_write_finished ();
void disk_write_finished ();
+
+struct OSXMediaPath
+{
+ bool real; ///< true for a "real" disk, false for a synthesized APFS one
+ std::string prt; ///< "PRT" entry from the media path
+};
+
+
+boost::optional<OSXMediaPath> analyse_osx_media_path (std::string path);
+
+
#endif
#endif