X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=b4378040abfa5c09cd23464d1a961c641b960c19;hb=44da1840ca17d0945cb1886bb17218990850894c;hp=f7b4704ace52caa583c2d09fb85926ba4a050aa7;hpb=4edc14c8b1410e24f68b510cc14409b96c0338a3;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index f7b4704ac..b4378040a 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -28,6 +28,8 @@ #include "types.h" #include "dcpomatic_time.h" #include "audio_mapping.h" +#include +#include #include #include #include @@ -100,6 +102,7 @@ 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, 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 std::string atmos_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 std::string careful_string_filter (std::string); extern std::pair audio_channel_types (std::list mapped, int channels); @@ -117,6 +120,8 @@ extern boost::shared_ptr read_swaroop_chain (boost::files extern void write_swaroop_chain (boost::shared_ptr chain, boost::filesystem::path output); #endif extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container); +extern dcp::DecryptedKDM decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm); +extern boost::filesystem::path default_font_file (); template std::list