diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset.cc | 2 | ||||
| -rw-r--r-- | src/cpl.cc | 6 | ||||
| -rw-r--r-- | src/subtitle_asset.cc | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/asset.cc b/src/asset.cc index ef06ea8d..f2efb293 100644 --- a/src/asset.cc +++ b/src/asset.cc @@ -114,10 +114,12 @@ Asset::add_to_assetmap(AssetMap& asset_map, boost::filesystem::path root) const void Asset::add_file_to_assetmap(AssetMap& asset_map, boost::filesystem::path root, boost::filesystem::path file, string id) { + std::cout << "toot toot " << root << " " << file << "\n"; auto path = relative_to_root ( filesystem::canonical(root), filesystem::canonical(file) ); + std::cout << "addin " << *path << "\n"; if (!path) { /* The path of this asset is not within our DCP, so we assume it's an external @@ -615,6 +615,12 @@ add_file_assets (vector<shared_ptr<T>>& assets, vector<shared_ptr<Reel>> reels) if (i->main_subtitle ()) { assets.push_back (i->main_subtitle()); } + if (i->main_caption()) { + assets.push_back(i->main_caption()); + } + for (auto j: i->closed_subtitles()) { + assets.push_back (j); + } for (auto j: i->closed_captions()) { assets.push_back (j); } diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc index 1cd4fc07..9203f508 100644 --- a/src/subtitle_asset.cc +++ b/src/subtitle_asset.cc @@ -567,8 +567,11 @@ vector<shared_ptr<const Subtitle>> SubtitleAsset::subtitles_during (Time from, Time to, bool starting) const { vector<shared_ptr<const Subtitle>> s; + // std::cout << "checkin " << _subtitles.size() << "\n"; for (auto i: _subtitles) { + // std::cout << "starting=" << starting << " " << from << " " << to << " " << i->in() << " " << i->out() << "\n"; if ((starting && from <= i->in() && i->in() < to) || (!starting && i->out() >= from && i->in() <= to)) { + std::cout << "given it up\n"; s.push_back (i); } } |