diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-05 00:05:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-05 14:36:27 +0100 |
| commit | fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc (patch) | |
| tree | 265ca14896f63eeff210d602c5f11ed19d800ebf /src/reel_asset.h | |
| parent | 7b717db244554300ebed8eade8421ee3faa28d33 (diff) | |
MXF -> Asset in lots of places.
Diffstat (limited to 'src/reel_asset.h')
| -rw-r--r-- | src/reel_asset.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reel_asset.h b/src/reel_asset.h index 7588c063..118f10a1 100644 --- a/src/reel_asset.h +++ b/src/reel_asset.h @@ -55,8 +55,8 @@ public: virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const; /** @return a Ref to our actual asset */ - Ref<Asset>& asset () { - return _asset; + Ref<Asset>& asset_ref () { + return _asset_ref; } int64_t entry_point () const { @@ -81,7 +81,7 @@ protected: /** Reference to the asset (MXF or XML file) that this reel entry * applies to. */ - Ref<Asset> _asset; + Ref<Asset> _asset_ref; private: |