projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
cross.h
diff --git
a/src/lib/cross.h
b/src/lib/cross.h
index d185286b1f381d02395ba36261313eaac3c10432..a00fee67917c95031a038c7b14fdeec0b8d85f30 100644
(file)
--- a/
src/lib/cross.h
+++ b/
src/lib/cross.h
@@
-17,9
+17,15
@@
*/
*/
+#include <boost/filesystem.hpp>
+
#ifdef DCPOMATIC_WINDOWS
#define WEXITSTATUS(w) (w)
#endif
#ifdef DCPOMATIC_WINDOWS
#define WEXITSTATUS(w) (w)
#endif
+class Log;
+
void dcpomatic_sleep (int);
extern std::pair<std::string, int> cpu_info ();
void dcpomatic_sleep (int);
extern std::pair<std::string, int> cpu_info ();
+extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path, boost::shared_ptr<Log>);
+extern std::list<std::pair<std::string, std::string> > mount_info ();