diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-09 02:13:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-09 02:13:01 +0100 |
| commit | 3a69e2805f4b2119194ba2357fa9895bf1ae147f (patch) | |
| tree | ad5e3eee08ad0651599e2e9cac38005d2aed397e /src/interop_subtitle_asset.cc | |
| parent | d630b7b1e1c77742ff131a7d0c9497f061f87142 (diff) | |
Store image subtitle ID in the object, rather than a separate map. Start of reading image subtitles.
Diffstat (limited to 'src/interop_subtitle_asset.cc')
| -rw-r--r-- | src/interop_subtitle_asset.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc index 2ef82c90..1cd99563 100644 --- a/src/interop_subtitle_asset.cc +++ b/src/interop_subtitle_asset.cc @@ -79,6 +79,8 @@ InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file) parse_subtitles (e, ps, optional<int>(), INTEROP); } } + + /* XXX: now find SubtitleImages in _subtitles and load their PNG */ } InteropSubtitleAsset::InteropSubtitleAsset () @@ -182,9 +184,7 @@ InteropSubtitleAsset::write (boost::filesystem::path p) const BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, _subtitles) { shared_ptr<dcp::SubtitleImage> im = dynamic_pointer_cast<dcp::SubtitleImage> (i); if (im) { - ImageUUIDMap::const_iterator uuid = _image_subtitle_uuid.find(im); - DCP_ASSERT (uuid != _image_subtitle_uuid.end()); - im->png_image().write (p.parent_path() / String::compose("%1.png", uuid->second)); + im->png_image().write (p.parent_path() / String::compose("%1.png", im->id())); } } |