Tidying a few things up.

[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 12fc5e66a0aa28f22455caa9a076fe5b5ebd3a78..78e056599eba8d542d0d3f1f22f8ccc6acc9fd0e 100644 (file)
--- a/src/reel_closed_caption_asset.h
+++ b/src/reel_closed_caption_asset.h
@@ -42,9 +42,9 @@
 
 
 #include "language_tag.h"
-#include "subtitle_asset.h"
 #include "reel_asset.h"
 #include "reel_file_asset.h"
+#include "subtitle_asset.h"
 
 
 struct verify_invalid_language2;
@@ -53,25 +53,25 @@ struct verify_invalid_language2;
 namespace dcp {
 
 
-class SubtitleAsset;
-
-
 /** @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);
        explicit ReelClosedCaptionAsset (std::shared_ptr<const cxml::Node>);
 
-       xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
-       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 asset_of_type<SubtitleAsset> ();
+       std::shared_ptr<SubtitleAsset> asset () {
+               return asset_of_type<SubtitleAsset>();
        }
 
+       bool equals (std::shared_ptr<const ReelClosedCaptionAsset>, EqualityOptions, NoteHandler) const;
+
        void set_language (dcp::LanguageTag l) {
                _language = l.to_string();
        }
@@ -84,13 +84,9 @@ public:
                return _language;
        }
 
-private:
+protected:
        friend struct ::verify_invalid_language2;
 
-       std::string key_type () const;
-       std::string cpl_node_name (Standard standard) const;
-       std::pair<std::string, std::string> cpl_node_namespace (Standard standard) const;
-
        boost::optional<std::string> _language;
 };