X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross.h;h=4067631bcf134a2200ae04b961ae4d609b7e1cba;hb=f0a2a52ddd1118236d4ce5640339c24bae88aa12;hp=8c1df998b56dec3ccdfd8758fa0262a4a76f1fa4;hpb=86765a617035e0283c20c9f2696909743e618156;p=dcpomatic.git diff --git a/src/lib/cross.h b/src/lib/cross.h index 8c1df998b..4067631bc 100644 --- a/src/lib/cross.h +++ b/src/lib/cross.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -37,9 +37,9 @@ class Log; struct AVIOContext; -void dcpomatic_sleep (int); +void dcpomatic_sleep_seconds (int); extern std::string cpu_info (); -extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path, boost::shared_ptr); +extern void run_ffprobe (boost::filesystem::path, boost::filesystem::path); extern std::list > mount_info (); extern boost::filesystem::path openssl_path (); #ifdef DCPOMATIC_OSX @@ -52,8 +52,12 @@ extern boost::filesystem::path shared_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 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 (); /** @class Waker * @brief A class which tries to keep the computer awake on various operating systems.