Cleanup: pass EqualityOptions as const&

[libdcp.git] / src / reel_closed_caption_asset.h

diff --git a/src/reel_closed_caption_asset.h b/src/reel_closed_caption_asset.h
index 44ae83f3226e30b4defab566af77da2de1203ef2..405de34b2e2cff77090555a5b452a7ca3e993d0d 100644 (file)
--- a/src/reel_closed_caption_asset.h
+++ b/src/reel_closed_caption_asset.h
@@ -56,18 +56,22 @@ namespace dcp {
 /** @class ReelClosedCaptionAsset
  *  @brief Part of a Reel's description which refers to a closed caption XML/MXF file
  */
-class ReelClosedCaptionAsset : public ReelAsset, public ReelFileAsset
+class ReelClosedCaptionAsset : public ReelFileAsset
 {
 public:
-       ReelClosedCaptionAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t instrinsic_duration, int64_t entry_point);
+       ReelClosedCaptionAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
        explicit ReelClosedCaptionAsset (std::shared_ptr<const cxml::Node>);
 
-       bool equals (std::shared_ptr<const ReelClosedCaptionAsset>, EqualityOptions, NoteHandler) const;
+       std::shared_ptr<const SubtitleAsset> asset () const {
+               return asset_of_type<const SubtitleAsset>();
+       }
 
-       std::shared_ptr<SubtitleAsset> asset () const {
-               return std::dynamic_pointer_cast<SubtitleAsset>(_asset_ref.asset());
+       std::shared_ptr<SubtitleAsset> asset () {
+               return asset_of_type<SubtitleAsset>();
        }
 
+       bool equals(std::shared_ptr<const ReelClosedCaptionAsset>, EqualityOptions const&, NoteHandler) const;
+
        void set_language (dcp::LanguageTag l) {
                _language = l.to_string();
        }