diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-12-16 17:44:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-12-16 19:28:54 +0100 |
| commit | 45ed3bf55175a8555123b320b366efb69b1ba629 (patch) | |
| tree | 64b9a8659d72af8c09ce663fd49592c780497fe6 | |
| parent | d2a71383bf9f47ac4277d8c353914cbfa6ab3a05 (diff) | |
Rename assets() to file_assets()
since this is what it was returning anyway.
| -rw-r--r-- | src/reel.cc | 6 | ||||
| -rw-r--r-- | src/reel.h | 2 | ||||
| -rw-r--r-- | src/verify.cc | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/reel.cc b/src/reel.cc index a298194f..469c4416 100644 --- a/src/reel.cc +++ b/src/reel.cc @@ -405,10 +405,10 @@ Reel::add (shared_ptr<ReelAsset> asset) } -vector<shared_ptr<ReelAsset>> -Reel::assets () const +vector<shared_ptr<ReelFileAsset>> +Reel::file_assets() const { - vector<shared_ptr<ReelAsset>> a; + vector<shared_ptr<ReelFileAsset>> a; if (_main_picture) { a.push_back (_main_picture); } @@ -133,7 +133,7 @@ public: void add (std::shared_ptr<ReelAsset> asset); - std::vector<std::shared_ptr<ReelAsset>> assets () const; + std::vector<std::shared_ptr<ReelFileAsset>> file_assets() const; xmlpp::Element* write_to_cpl (xmlpp::Element* node, Standard standard) const; diff --git a/src/verify.cc b/src/verify.cc index 4a767de1..2f094ebe 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -1406,22 +1406,21 @@ verify_reel( map<Marker, Time>* markers_seen ) { - for (auto i: reel->assets()) { + for (auto i: reel->file_assets()) { if (i->duration() && (i->duration().get() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) { context.error(VerificationNote::Code::INVALID_DURATION, i->id()); } if ((i->intrinsic_duration() * i->edit_rate().denominator / i->edit_rate().numerator) < 1) { context.error(VerificationNote::Code::INVALID_INTRINSIC_DURATION, i->id()); } - auto file_asset = dynamic_pointer_cast<ReelFileAsset>(i); - if (i->encryptable() && !file_asset->hash()) { + if (i->encryptable() && !i->hash()) { context.bv21_error(VerificationNote::Code::MISSING_HASH, i->id()); } } if (context.dcp->standard() == Standard::SMPTE) { boost::optional<int64_t> duration; - for (auto i: reel->assets()) { + for (auto i: reel->file_assets()) { if (!duration) { duration = i->actual_duration(); } else if (*duration != i->actual_duration()) { |