From 751379da4be48f9b911a91cf17686330dd999d0c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 5 Dec 2023 01:59:44 +0100 Subject: Account for split branch in libdcp. --- 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 b92869b25..f4bf51e8e 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -49,7 +49,7 @@ namespace dcp { class PictureAsset; class SoundAsset; - class SubtitleAsset; + class TextAsset; } extern std::string program_name; @@ -81,7 +81,7 @@ extern dcp::Size fit_ratio_within (float ratio, dcp::Size); extern void set_backtrace_file (boost::filesystem::path); extern std::string video_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); extern std::string audio_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); -extern std::string subtitle_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary, std::string extension); +extern std::string subtitle_asset_filename(std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary, std::string extension); extern std::string atmos_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); extern std::string careful_string_filter (std::string); extern std::pair audio_channel_types (std::list mapped, int channels); -- cgit v1.2.3