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

diff --combined src/reel_asset.h
index 47bae6752dc7d29dd76abe92dc74f209ab7e4cfe,981d70db42dc3c86b2efc33d7717bd67a49d5f01..e9704acd57d43cead8c88f314714ab7958e57ea0
--- 1/src/reel_asset.h
--- 2/src/reel_asset.h
+++ b/src/reel_asset.h
@@@ -1,5 -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,10 -17,6 +17,10 @@@
  
  */
  
 +/** @file  src/reel_asset.h
 + *  @brief ReelAsset class.
 + */
 +
  #ifndef LIBDCP_REEL_ASSET_H
  #define LIBDCP_REEL_ASSET_H
  
@@@ -59,10 -55,15 +59,15 @@@ public
        virtual bool equals (boost::shared_ptr<const ReelAsset>, EqualityOptions, NoteHandler) const;
  
        /** @return a Ref to our actual asset */
-       Ref<Asset>& asset_ref () {
+       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 entry_point () const {
                return _entry_point;
        }
@@@ -88,6 -89,7 +93,6 @@@ protected
        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

diff --combined src/types.h
index 16908952a58c135d06c0fce3d42c0eec62fa291d,46881a608231c5a5b12d1e8ed8f92e54a8fee70d..f364572b8d33df912218e8cffe68393b318fd569
--- 1/src/types.h
--- 2/src/types.h
+++ b/src/types.h
@@@ -147,6 -147,7 +147,7 @@@ public
  
  extern bool operator== (Fraction const & a, Fraction const & b);
  extern bool operator!= (Fraction const & a, Fraction const & b);
+ extern std::ostream& operator<< (std::ostream& s, Fraction const & f);        
  
  /** @struct EqualityOptions
   *  @brief  A class to describe what "equality" means for a particular test.
@@@ -172,9 -173,9 +173,9 @@@ struct EqualityOption
        double max_std_dev_pixel_error;
        /** The maximum difference in audio sample value between two soundtracks */
        int max_audio_sample_error;
 -      /** true if the <AnnotationText> nodes of CPLs are allowed to differ */
 +      /** true if the &lt;AnnotationText&gt; nodes of CPLs are allowed to differ */
        bool cpl_annotation_texts_can_differ;
 -      /** true if the <AnnotationText> nodes of Reels are allowed to differ */
 +      /** true if the &lt;AnnotationText&gt; nodes of Reels are allowed to differ */
        bool reel_annotation_texts_can_differ;
        /** true if <Hash>es in Reels can differ */
        bool reel_hashes_can_differ;