summaryrefslogtreecommitdiff
path: root/src/reel_asset.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/reel_asset.h')
-rw-r--r--src/reel_asset.h6
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: