Rename ReelFileAsset -> ReelEncryptableAsset

[libdcp.git] / src / reel_subtitle_asset.h

diff --git a/src/reel_subtitle_asset.h b/src/reel_subtitle_asset.h
index 8c3b7d185cad946a7a91f05cc7f091d3c741ae74..8126547734ec512493b837b36709a6b20bba4554 100644 (file)
--- a/src/reel_subtitle_asset.h
+++ b/src/reel_subtitle_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,28 +31,35 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/reel_subtitle_asset.h
  *  @brief ReelSubtitleAsset class.
  */
 
+
 #ifndef LIBDCP_REEL_SUBTITLE_ASSET_H
 #define LIBDCP_REEL_SUBTITLE_ASSET_H
 
+
 #include "language_tag.h"
 #include "reel_asset.h"
-#include "reel_mxf.h"
+#include "reel_encryptable_asset.h"
 #include "subtitle_asset.h"
 
-struct verify_test26;
+
+struct verify_invalid_language1;
+
 
 namespace dcp {
 
+
 class SubtitleAsset;
 
+
 /** @class ReelSubtitleAsset
- *  @brief Part of a Reel's description which refers to a subtitle XML/MXF file.
+ *  @brief Part of a Reel's description which refers to a subtitle XML/MXF file
  */
-class ReelSubtitleAsset : public ReelAsset, public ReelMXF
+class ReelSubtitleAsset : public ReelAsset, public ReelEncryptableAsset
 {
 public:
        ReelSubtitleAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
@@ -72,7 +79,7 @@ public:
        }
 
 private:
-       friend struct ::verify_test26;
+       friend struct ::verify_invalid_language1;
 
        std::string key_type () const;
        std::string cpl_node_name (Standard standard) const;
@@ -84,6 +91,8 @@ private:
        boost::optional<std::string> _language;
 };
 
+
 }
 
+
 #endif