diff options
| author | Carl Hetherington <cth@carlh.net> | 2026-02-07 23:09:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2026-02-07 23:20:49 +0100 |
| commit | 943b105e82d0cf4223bd27a8e4bd871d6eb1e77f (patch) | |
| tree | e98ec89e4f1f7dfaea1d3ea898e15520afce7ccb /src | |
| parent | e7e1fae0921be22458a6e6b99ee27d87233f1293 (diff) | |
Remove some unnecessary casts up to ReelFileAsset.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/reusable_reel_asset.cc | 2 | ||||
| -rw-r--r-- | src/lib/reusable_reel_asset.h | 4 | ||||
| -rw-r--r-- | src/lib/writer.cc | 15 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/lib/reusable_reel_asset.cc b/src/lib/reusable_reel_asset.cc index 14058906a..ab14460e0 100644 --- a/src/lib/reusable_reel_asset.cc +++ b/src/lib/reusable_reel_asset.cc @@ -43,7 +43,7 @@ using namespace dcpomatic; static void -maybe_add_asset(list<ReusableReelAsset>& a, shared_ptr<dcp::ReelAsset> r, Frame reel_trim_start, Frame reel_trim_end, DCPTime from, int const ffr) +maybe_add_asset(list<ReusableReelAsset>& a, shared_ptr<dcp::ReelFileAsset> r, Frame reel_trim_start, Frame reel_trim_end, DCPTime from, int const ffr, bool reference) { DCPOMATIC_ASSERT (r); r->set_entry_point (r->entry_point().get_value_or(0) + reel_trim_start); diff --git a/src/lib/reusable_reel_asset.h b/src/lib/reusable_reel_asset.h index ad0378c41..3ff610909 100644 --- a/src/lib/reusable_reel_asset.h +++ b/src/lib/reusable_reel_asset.h @@ -39,14 +39,14 @@ public: COPY }; - ReusableReelAsset(std::shared_ptr<dcp::ReelAsset> asset_, dcpomatic::DCPTimePeriod period_, Use use_) + ReusableReelAsset(std::shared_ptr<dcp::ReelFileAsset> asset_, dcpomatic::DCPTimePeriod period_, Use use_) : asset(asset_) , period(period_) , use(use_) {} /** The asset */ - std::shared_ptr<dcp::ReelAsset> asset; + std::shared_ptr<dcp::ReelFileAsset> asset; /** Period that this asset covers in the DCP */ dcpomatic::DCPTimePeriod period; /** How this asset is used - referred to or copied */ diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 3fbfe6b5f..60a24ee96 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -937,9 +937,8 @@ try { int64_t total_size = 0; for (auto const& i: _reel_assets) { - auto file = dynamic_pointer_cast<dcp::ReelFileAsset>(i.asset); - if (file && !file->hash()) { - auto filename = file->asset_ref().asset()->file(); + if (!i.asset->hash()) { + auto const filename = i.asset->asset_ref().asset()->file(); DCPOMATIC_ASSERT(filename); total_size += boost::filesystem::file_size(*filename); } @@ -947,13 +946,13 @@ try int64_t total_done = 0; for (auto const& i: _reel_assets) { - auto file = dynamic_pointer_cast<dcp::ReelFileAsset>(i.asset); - if (file && !file->hash()) { - file->asset_ref().asset()->hash([&total_done, total_size, set_progress](int64_t done, int64_t) { + if (!i.asset->hash()) { + auto asset = i.asset->asset_ref().asset(); + asset->hash([&total_done, total_size, set_progress](int64_t done, int64_t) { set_progress(total_done + done, total_size); }); - total_done += boost::filesystem::file_size(*file->asset_ref().asset()->file()); - file->set_hash(file->asset_ref().asset()->hash()); + total_done += boost::filesystem::file_size(*asset->file()); + i.asset->set_hash(asset->hash()); } } } catch (boost::thread_interrupted) { |