projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Specify CPL standard on construction.
[libdcp.git]
/
src
/
cpl.h
diff --git
a/src/cpl.h
b/src/cpl.h
index 84dbd9ff52d7e784cc2e09a5d845c243c57f28a8..03e35a4e3220b3a08257572dac1642a9da047067 100644
(file)
--- a/
src/cpl.h
+++ b/
src/cpl.h
@@
-73,7
+73,7
@@
class DecryptedKDM;
class CPL : public Asset
{
public:
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);
/** Construct a CPL object from a XML file */
explicit CPL (boost::filesystem::path file);
@@
-117,12
+117,10
@@
public:
/** Write an CompositonPlaylist XML file
*
* @param file Filename to write
/** 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,
* @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;
std::shared_ptr<const CertificateChain>
) const;
@@
-306,7
+304,7
@@
public:
void set_additional_subtitle_languages (std::vector<dcp::LanguageTag> const& lang);
void set_additional_subtitle_languages (std::vector<dcp::LanguageTag> const& lang);
-
boost::optional<Standard>
standard () const {
+
Standard
standard () const {
return _standard;
}
return _standard;
}
@@
-354,7
+352,7
@@
private:
std::vector<std::shared_ptr<Reel>> _reels;
/** Standard of CPL that was read in */
std::vector<std::shared_ptr<Reel>> _reels;
/** Standard of CPL that was read in */
-
boost::optional<Standard>
_standard;
+
Standard
_standard;
};
};