Split ReelClosedCaptionAsset into Interop and SMPTE parts.

1 files changed, 5 insertions, 13 deletions

diff --git a/src/reel_closed_caption_asset.h b/src/reel_closed_caption_asset.h
index 80421ca2..44ae83f3 100644
--- 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_encryptable_asset.h"
+#include "reel_file_asset.h"
+#include "subtitle_asset.h"
 
 
 struct verify_invalid_language2;
@@ -53,23 +53,19 @@ 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, public ReelEncryptableAsset
+class ReelClosedCaptionAsset : public ReelAsset, 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<SubtitleAsset> asset () const {
-		return asset_of_type<SubtitleAsset> ();
+		return std::dynamic_pointer_cast<SubtitleAsset>(_asset_ref.asset());
 	}
 
 	void set_language (dcp::LanguageTag l) {
@@ -84,13 +80,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;
 };