From c4403784febdbdd42e9c32e67fadb147f11fe566 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 8 May 2019 23:41:42 +0100 Subject: Put Time types in dcpomatic namespace. --- src/lib/util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/util.h') diff --git a/src/lib/util.h b/src/lib/util.h index 6cb818b39..b760f7f4b 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -72,7 +72,7 @@ class AudioBuffers; class TextDecoder; extern std::string seconds_to_hms (int); -extern std::string time_to_hmsf (DCPTime time, Frame rate); +extern std::string time_to_hmsf (dcpomatic::DCPTime time, Frame rate); extern std::string seconds_to_approximate_hms (int); extern double seconds (struct timeval); extern void dcpomatic_setup (); @@ -105,7 +105,7 @@ extern void checked_fread (void* ptr, size_t size, FILE* stream, boost::filesyst extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path); extern size_t utf8_strlen (std::string s); extern std::string day_of_week_to_string (boost::gregorian::greg_weekday d); -extern void emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr decoder); +extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr decoder); #ifdef DCPOMATIC_VARIANT_SWAROOP extern boost::shared_ptr read_swaroop_chain (boost::filesystem::path path); extern void write_swaroop_chain (boost::shared_ptr chain, boost::filesystem::path output); -- cgit v1.2.3