Remove ReelEncryptableAsset and tidy up a bit.

[libdcp.git] / src / cpl.h

diff --git a/src/cpl.h b/src/cpl.h
index 586beb818336e4b2810518cd16003d16747e428e..246233c1e0a05d141451861226630c3335c89b9b 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -59,7 +59,7 @@ struct verify_invalid_language3;
 namespace dcp {
 
 
-class ReelEncryptableAsset;
+class ReelFileAsset;
 class Reel;
 class MXFMetadata;
 class CertificateChain;
@@ -72,7 +72,7 @@ class DecryptedKDM;
 class CPL : public Asset
 {
 public:
-       CPL (std::string annotation_text, ContentKind content_kind);
+       CPL (std::string annotation_text, ContentKind content_kind, Standard standard);
 
        /** Construct a CPL object from a XML file */
        explicit CPL (boost::filesystem::path file);
@@ -99,9 +99,9 @@ public:
                return _reels;
        }
 
-       /** @return the ReelEncryptableAssets in this CPL in all reels */
-       std::vector<std::shared_ptr<const ReelEncryptableAsset>> reel_file_assets () const;
-       std::vector<std::shared_ptr<ReelEncryptableAsset>> reel_file_assets ();
+       /** @return the ReelFileAssets in this CPL in all reels */
+       std::vector<std::shared_ptr<const ReelFileAsset>> reel_file_assets () const;
+       std::vector<std::shared_ptr<ReelFileAsset>> reel_file_assets ();
 
        /** @return true if we have any encrypted content */
        bool any_encrypted () const;
@@ -112,12 +112,10 @@ public:
        /** Write an CompositonPlaylist XML file
         *
         *  @param file Filename to write
-        *  @param standard INTEROP or SMPTE
         *  @param signer Signer to sign the CPL, or 0 to add no signature
         */
        void write_xml (
                boost::filesystem::path file,
-               Standard standard,
                std::shared_ptr<const CertificateChain>
                ) const;
 
@@ -301,7 +299,7 @@ public:
 
        void set_additional_subtitle_languages (std::vector<dcp::LanguageTag> const& lang);
 
-       boost::optional<Standard> standard () const {
+       Standard standard () const {
                return _standard;
        }
 
@@ -349,7 +347,7 @@ private:
        std::vector<std::shared_ptr<Reel>> _reels;
 
        /** Standard of CPL that was read in */
-       boost::optional<Standard> _standard;
+       Standard _standard;
 };