diff options
Diffstat (limited to 'src/reel_asset.h')
| -rw-r--r-- | src/reel_asset.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/reel_asset.h b/src/reel_asset.h index 4092a97a..072d55fd 100644 --- a/src/reel_asset.h +++ b/src/reel_asset.h @@ -82,7 +82,7 @@ public: _entry_point = e; } - int64_t entry_point () const { + boost::optional<int64_t> entry_point () const { return _entry_point; } @@ -90,10 +90,12 @@ public: _duration = d; } - int64_t duration () const { + boost::optional<int64_t> duration () const { return _duration; } + int64_t actual_duration () const; + std::string annotation_text () const { return _annotation_text; } @@ -119,13 +121,13 @@ protected: xmlpp::Node* write_to_cpl_base (xmlpp::Node* node, Standard standard, boost::optional<std::string> hash) const; - int64_t _intrinsic_duration; ///< The <IntrinsicDuration> from the reel's entry for this asset - int64_t _duration; ///< The <Duration> from the reel's entry for this asset + int64_t _intrinsic_duration; ///< The <IntrinsicDuration> from the reel's entry for this asset + boost::optional<int64_t> _duration; ///< The <Duration> from the reel's entry for this asset, if present private: - std::string _annotation_text; ///< The <AnnotationText> from the reel's entry for this asset - Fraction _edit_rate; ///< The <EditRate> from the reel's entry for this asset - int64_t _entry_point; ///< The <EntryPoint> from the reel's entry for this asset + std::string _annotation_text; ///< The <AnnotationText> from the reel's entry for this asset + Fraction _edit_rate; ///< The <EditRate> from the reel's entry for this asset + boost::optional<int64_t> _entry_point; ///< The <EntryPoint> from the reel's entry for this asset }; } |