X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=7d3afb022856e963ee870b9b323b82c8ff235c5c;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=58c2771b7cebd8e46b9d700c3218041abd3dadd4;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index 58c2771b7..7d3afb022 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -41,12 +41,6 @@ extern "C" { #include "types.h" #include "video_content.h" -#ifdef DCPOMATIC_DEBUG -#define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING); -#else -#define TIMING(...) -#endif - #undef check /** The maximum number of audio channels that we can have in a DCP */ @@ -59,6 +53,7 @@ namespace libdcp { } class Job; +struct AVSubtitle; extern std::string seconds_to_hms (int); extern std::string seconds_to_approximate_hms (int); @@ -69,7 +64,6 @@ extern void dcpomatic_setup (); extern void dcpomatic_setup_gettext_i18n (std::string); extern std::vector split_at_spaces_considering_quotes (std::string); extern std::string md5_digest (std::vector, boost::shared_ptr); -extern std::string md5_digest (void const *, int); extern void ensure_ui_thread (); extern std::string audio_channel_name (int); extern bool valid_image_file (boost::filesystem::path); @@ -91,6 +85,7 @@ extern int get_optional_int (std::multimap const & kv, extern std::string get_optional_string (std::multimap const & kv, std::string k); extern void* wrapped_av_malloc (size_t); extern int64_t divide_with_round (int64_t a, int64_t b); +extern ContentTimePeriod subtitle_period (AVSubtitle const &); /** @class Socket * @brief A class to wrap a boost::asio::ip::tcp::socket with some things