X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=e786bb9c1a7a4251ffe7d5a5a9974f531348d83f;hb=f64496a0e94c452caf179cf31722b5808c3e1907;hp=f6306c9712528fb04b0e6f3b8f019048b6ef5ba5;hpb=31a33018f113cb7b631dd7bb4d0ed2a7de914cd8;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index f6306c971..e786bb9c1 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #undef check @@ -60,7 +61,7 @@ extern double seconds (struct timeval); extern void dcpomatic_setup (); extern void dcpomatic_setup_path_encoding (); extern void dcpomatic_setup_gettext_i18n (std::string); -extern std::string md5_digest_head_tail (std::vector, boost::uintmax_t size); +extern std::string digest_head_tail (std::vector, boost::uintmax_t size); extern void ensure_ui_thread (); extern std::string audio_channel_name (int); extern bool valid_image_file (boost::filesystem::path); @@ -74,8 +75,8 @@ extern int stride_round_up (int, int const *, int); extern void* wrapped_av_malloc (size_t); extern void set_backtrace_file (boost::filesystem::path); extern std::map split_get_request (std::string url); -extern std::string video_asset_filename (boost::shared_ptr asset); -extern std::string audio_asset_filename (boost::shared_ptr asset); +extern std::string video_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string audio_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); extern float relaxed_string_to_float (std::string); extern bool string_not_empty (std::string);