diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-04 16:42:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-05 14:34:42 +0100 |
| commit | 2105caa32a12236d5b70a0cf8b9ac62fcf7f574e (patch) | |
| tree | c19bc651579257b262ab5001790790b75edc95c8 /src/reel_asset.h | |
| parent | 4f590672720ace3ccb9582a2f539683fa83e1ac8 (diff) | |
Remove unnecessary Content class.
Diffstat (limited to 'src/reel_asset.h')
| -rw-r--r-- | src/reel_asset.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/reel_asset.h b/src/reel_asset.h index 6db621cc..7588c063 100644 --- a/src/reel_asset.h +++ b/src/reel_asset.h @@ -35,7 +35,7 @@ namespace xmlpp { namespace dcp { -class Content; +class Asset; /** @class ReelAsset * @brief An entry in a <Reel> which refers to a use of a piece of content. @@ -48,15 +48,15 @@ class ReelAsset : public Object { public: ReelAsset (); - ReelAsset (boost::shared_ptr<Content> content, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point); + ReelAsset (boost::shared_ptr<Asset> asset, 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; virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const; - /** @return a Ref to our actual content */ - Ref<Content>& content () { - return _content; + /** @return a Ref to our actual asset */ + Ref<Asset>& asset () { + return _asset; } int64_t entry_point () const { @@ -78,10 +78,10 @@ protected: */ virtual std::pair<std::string, std::string> cpl_node_attribute (Standard) const; - /** Reference to the content (MXF or XML file) that this reel entry + /** Reference to the asset (MXF or XML file) that this reel entry * applies to. */ - Ref<Content> _content; + Ref<Asset> _asset; private: |