Include trimming.
[libdcp.git] / src / pkl.h
index 315c1554f1fdde195e1460cd7023573b0372c610..d0a111887394478fcff17b0c60a0585fbb28ff95 100644 (file)
--- a/src/pkl.h
+++ b/src/pkl.h
@@ -41,8 +41,8 @@
 #define LIBDCP_PKL_H
 
 
+#include "asset_list.h"
 #include "object.h"
-#include "types.h"
 #include "util.h"
 #include "certificate_chain.h"
 #include <libcxml/cxml.h>
 namespace dcp {
 
 
-class PKL : public Object
+class PKL : public Object, public AssetList
 {
 public:
        PKL (Standard standard, boost::optional<std::string> annotation_text, std::string issue_date, std::string issuer, std::string creator)
-               : _standard (standard)
-               , _annotation_text (annotation_text)
-               , _issue_date (issue_date)
-               , _issuer (issuer)
-               , _creator (creator)
+               : AssetList(standard, annotation_text, issue_date, issuer, creator)
        {}
 
        explicit PKL (boost::filesystem::path file);
 
-       Standard standard () const {
-               return _standard;
-       }
-
-       boost::optional<std::string> annotation_text () const {
-               return _annotation_text;
-       }
-
-       void set_annotation_text(std::string annotation_text) {
-               _annotation_text = annotation_text;
-       }
-
-       void set_issue_date(std::string issue_date) {
-               _issue_date = issue_date;
-       }
-
-       void set_issuer(std::string issuer) {
-               _issuer = issuer;
-       }
-
-       void set_creator(std::string creator) {
-               _creator = creator;
-       }
-
        boost::optional<std::string> hash (std::string id) const;
        boost::optional<std::string> type (std::string id) const;
 
        void clear_assets();
-       void add_asset (std::string id, boost::optional<std::string> annotation_text, std::string hash, int64_t size, std::string type);
-       void write (boost::filesystem::path file, std::shared_ptr<const CertificateChain> signer) const;
+       void add_asset(std::string id, boost::optional<std::string> annotation_text, std::string hash, int64_t size, std::string type, std::string original_filename);
+       void write_xml (boost::filesystem::path file, std::shared_ptr<const CertificateChain> signer) const;
 
        /** @return the most recent disk file used to read or write this PKL, if there is one */
        boost::optional<boost::filesystem::path> file () const {
@@ -110,14 +82,16 @@ public:
                        , _hash (node->string_child("Hash"))
                        , _size (node->number_child<int64_t>("Size"))
                        , _type (node->string_child("Type"))
+                       , _original_filename(node->optional_string_child("OriginalFileName"))
                {}
 
-               Asset (std::string id, boost::optional<std::string> annotation_text, std::string hash, int64_t size, std::string type)
+               Asset(std::string id, boost::optional<std::string> annotation_text, std::string hash, int64_t size, std::string type, std::string original_filename)
                        : Object (id)
                        , _annotation_text (annotation_text)
                        , _hash (hash)
                        , _size (size)
                        , _type (type)
+                       , _original_filename(original_filename)
                {}
 
                boost::optional<std::string> annotation_text () const {
@@ -136,25 +110,24 @@ public:
                        return _type;
                }
 
+               boost::optional<std::string> original_filename() const {
+                       return _original_filename;
+               }
+
        private:
                boost::optional<std::string> _annotation_text;
                std::string _hash;
                int64_t _size = 0;
                std::string _type;
+               boost::optional<std::string> _original_filename;
        };
 
-       std::vector<std::shared_ptr<Asset>> asset_list () const {
-               return _asset_list;
+       std::vector<std::shared_ptr<Asset>> assets() const {
+               return _assets;
        }
 
 private:
-
-       Standard _standard = dcp::Standard::SMPTE;
-       boost::optional<std::string> _annotation_text;
-       std::string _issue_date;
-       std::string _issuer;
-       std::string _creator;
-       std::vector<std::shared_ptr<Asset>> _asset_list;
+       std::vector<std::shared_ptr<Asset>> _assets;
        /** The most recent disk file used to read or write this PKL */
        mutable boost::optional<boost::filesystem::path> _file;
 };