diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
| commit | 89115db77729a2c99f1a09ff6a461720e16f889e (patch) | |
| tree | e528ec014b820d4e0efa28893dcee91cd76ee618 /src/lib/cross.h | |
| parent | f8ad440cf187c517b7800f3efdfc0954025c4422 (diff) | |
| parent | d2ff6a6b0256e256b6df416f280c846072f7682f (diff) | |
Merge master.
Diffstat (limited to 'src/lib/cross.h')
| -rw-r--r-- | src/lib/cross.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/cross.h b/src/lib/cross.h index d185286b1..a00fee679 100644 --- 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 +class Log; + 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 (); |