Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

[libdcp.git] / src / reel_asset.h

diff --git a/src/reel_asset.h b/src/reel_asset.h
index b5e0537c4172f55c0638297dc05492c9e382e7c6..40eb6986f975aeb27c7b9c69527b9a0ac359cb74 100644 (file)
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -48,7 +48,7 @@ class ReelAsset : public Object
 {
 public:
        ReelAsset ();
-       ReelAsset (boost::shared_ptr<Content> content, int64_t entry_point);
+       ReelAsset (boost::shared_ptr<Content> content, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
        ReelAsset (boost::shared_ptr<const cxml::Node>);
 
        virtual void write_to_cpl (xmlpp::Node* node, Standard standard) const;
@@ -74,6 +74,14 @@ public:
                return !_key_id.empty ();
        }
 
+       int64_t entry_point () const {
+               return _entry_point;
+       }
+
+       int64_t duration () const {
+               return _duration;
+       }
+
        /** @return Key ID to describe the key that encrypts this asset's;
         *  content.
         */
@@ -82,7 +90,7 @@ public:
        }
 
 protected:
-       /** @return the node name that this asset uses in the CPL's <Reel> node
+       /** @return the node name that this asset uses in the CPL's &lt;Reel&gt; node
         *  e.g. MainPicture, MainSound etc.
         */
        virtual std::string cpl_node_name () const = 0;
@@ -99,13 +107,13 @@ protected:
 
 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 _intrinsic_duration;  ///< The <IntrinsicDuration> from the reel's entry for this asset
-       int64_t _entry_point;         ///< The <EntryPoint> from the reel's entry for this asset
-       int64_t _duration;            ///< The <Duration> from the reel's entry for this asset
-       std::string _hash;            ///< The <Hash> from the reel's entry for this asset
-       std::string _key_id;          ///< The <KeyId> from the reel's entry for this asset, or empty if there isn't one
+       std::string _annotation_text; ///< The &lt;AnnotationText&gt; from the reel's entry for this asset
+       Fraction _edit_rate;          ///< The &lt;EditRate&gt; from the reel's entry for this asset
+       int64_t _intrinsic_duration;  ///< The &lt;IntrinsicDuration&gt; from the reel's entry for this asset
+       int64_t _entry_point;         ///< The &lt;EntryPoint&gt; from the reel's entry for this asset
+       int64_t _duration;            ///< The &lt;Duration&gt; from the reel's entry for this asset
+       std::string _hash;            ///< The &lt;Hash&gt; from the reel's entry for this asset
+       std::string _key_id;          ///< The &lt;KeyId&gt; from the reel's entry for this asset, or empty if there isn't one
 };
 
 }