diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-13 23:36:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-13 23:36:22 +0200 |
| commit | 488e3d1bd5e6b17d49f6db4df14c64f4b64db89b (patch) | |
| tree | 641fcf167b845df6eca68c54fdf1110a7a07a739 /src/reel_smpte_closed_caption_asset.h | |
| parent | 51ae14c7e304d4fbc8d7524d584f3f4762d51f67 (diff) | |
Remove ReelEncryptableAsset and tidy up a bit.
Diffstat (limited to 'src/reel_smpte_closed_caption_asset.h')
| -rw-r--r-- | src/reel_smpte_closed_caption_asset.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/reel_smpte_closed_caption_asset.h b/src/reel_smpte_closed_caption_asset.h index 32fe5117..889ce5f6 100644 --- a/src/reel_smpte_closed_caption_asset.h +++ b/src/reel_smpte_closed_caption_asset.h @@ -41,7 +41,6 @@ #define LIBDCP_REEL_SMPTE_CLOSED_CAPTION_ASSET_H -#include "reel_encryptable_asset.h" #include "reel_file_asset.h" #include "reel_closed_caption_asset.h" #include "smpte_subtitle_asset.h" @@ -50,7 +49,7 @@ namespace dcp { -class ReelSMPTEClosedCaptionAsset : public ReelClosedCaptionAsset, public ReelEncryptableAsset +class ReelSMPTEClosedCaptionAsset : public ReelClosedCaptionAsset { public: ReelSMPTEClosedCaptionAsset (std::shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t instrinsic_duration, int64_t entry_point); @@ -63,8 +62,8 @@ public: } private: - std::string key_type () const override { - return "MDSK"; + boost::optional<std::string> key_type () const override { + return std::string("MDSK"); } std::string cpl_node_name (Standard) const override; |