diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-12-05 01:59:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-12-05 01:59:44 +0100 |
| commit | 751379da4be48f9b911a91cf17686330dd999d0c (patch) | |
| tree | eeb73eebfe9224956e8dde72b127872b23459dd5 /src/lib/reel_writer.h | |
| parent | 138882d651c5fb9d1dc66d092fcca7f3762a1226 (diff) | |
Account for split branch in libdcp.split
Diffstat (limited to 'src/lib/reel_writer.h')
| -rw-r--r-- | src/lib/reel_writer.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h index c9052c832..783981b5d 100644 --- a/src/lib/reel_writer.h +++ b/src/lib/reel_writer.h @@ -52,7 +52,7 @@ namespace dcp { class SoundAssetWriter; class StereoPictureAsset; class StereoPictureAssetWriter; - class SubtitleAsset; + class TextAsset; } @@ -104,7 +104,7 @@ private: long frame_info_position (Frame frame, Eyes eyes) const; Frame check_existing_picture_asset (boost::filesystem::path asset); bool existing_picture_frame_ok (dcp::File& asset_file, std::shared_ptr<InfoFileHandle> info_file, Frame frame) const; - std::shared_ptr<dcp::SubtitleAsset> empty_text_asset (TextType type, boost::optional<DCPTextTrack> track, bool with_dummy) const; + std::shared_ptr<dcp::TextAsset> empty_text_asset(TextType type, boost::optional<DCPTextTrack> track, bool with_dummy) const; std::shared_ptr<dcp::ReelPictureAsset> create_reel_picture (std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const; void create_reel_sound (std::shared_ptr<dcp::Reel> reel, std::list<ReferencedReelAsset> const & refs) const; @@ -117,7 +117,7 @@ private: std::set<DCPTextTrack> ensure_closed_captions ) const; void create_reel_markers (std::shared_ptr<dcp::Reel> reel) const; - float convert_vertical_position(StringText const& subtitle, dcp::SubtitleStandard to) const; + float convert_vertical_position(StringText const& subtitle, dcp::TextStandard to) const; dcpomatic::DCPTimePeriod _period; /** the first picture frame index that does not already exist in our MXF */ @@ -139,8 +139,8 @@ private: std::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer; std::shared_ptr<dcp::SoundAsset> _sound_asset; std::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer; - std::shared_ptr<dcp::SubtitleAsset> _subtitle_asset; - std::map<DCPTextTrack, std::shared_ptr<dcp::SubtitleAsset>> _closed_caption_assets; + std::shared_ptr<dcp::TextAsset> _subtitle_asset; + std::map<DCPTextTrack, std::shared_ptr<dcp::TextAsset>> _closed_caption_assets; std::shared_ptr<dcp::AtmosAsset> _atmos_asset; std::shared_ptr<dcp::AtmosAssetWriter> _atmos_asset_writer; |