Try to fix build on OS X.

[libdcp.git] / src / reel_asset.h

diff --git a/src/reel_asset.h b/src/reel_asset.h
index 7588c063f349256da6d3c2a22a9e244442e4e285..a1ad3cb12298e875e9414a7770504a3bfaf8f8a8 100644 (file)
--- a/src/reel_asset.h
+++ b/src/reel_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/reel_asset.h
+ *  @brief ReelAsset class.
+ */
+
 #ifndef LIBDCP_REEL_ASSET_H
 #define LIBDCP_REEL_ASSET_H
 
@@ -42,7 +46,7 @@ class Asset;
  *
  *  This class encapsulates the XML that exists in a &lt;Reel&gt; to say
  *  that a piece of content is used in this reel.  It does not
- *  describe the content itself (but links to a Content object which does).
+ *  describe the content itself (but links to an Asset object which does).
  */
 class ReelAsset : public Object
 {
@@ -55,8 +59,17 @@ 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> const & asset_ref () const {
+               return _asset_ref;
+       }
+
+       /** @return a Ref to our actual asset */
+       Ref<Asset>& asset_ref () {
+               return _asset_ref;
+       }
+
+       int64_t intrinsic_duration () const {
+               return _intrinsic_duration;
        }
 
        int64_t entry_point () const {
@@ -81,10 +94,9 @@ protected:
        /** Reference to the asset (MXF or XML file) that this reel entry
         *  applies to.
         */
-       Ref<Asset> _asset;
+       Ref<Asset> _asset_ref;
 
 private:
-       
        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