Bump libcxml for Centos build fix.

[libdcp.git] / src / asset.h

diff --git a/src/asset.h b/src/asset.h
index ec1385e673bda2a5123982c8ba3bf1ad1b2ad3f3..6db8e5c271761670e0ce20d7187ed34460466650 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -32,7 +32,7 @@
 #include "types.h"
 
 namespace ASDCP {
-       class WriterInfo;
+       struct WriterInfo;
 }
 
 namespace xmlpp {
@@ -53,20 +53,19 @@ public:
         *  @param directory Directory where our XML or MXF file is.
         *  @param file_name Name of our file within directory, or empty to make one up based on UUID.
         */
-       Asset (boost::filesystem::path directory, std::string file_name = "");
+       Asset (boost::filesystem::path directory, boost::filesystem::path file_name = "");
 
        virtual ~Asset() {}
 
        /** Write details of the asset to a CPL AssetList node.
         *  @param p Parent element.
-        *  @param i true to use the Interop standard, false for SMPTE.
         */
-       virtual void write_to_cpl (xmlpp::Element* p, bool i) const = 0;
+       virtual void write_to_cpl (xmlpp::Element* p) const = 0;
 
        /** Write details of the asset to a PKL AssetList node.
         *  @param p Parent node.
         */
-       void write_to_pkl (xmlpp::Node *) const;
+       void write_to_pkl (xmlpp::Node *, bool interop) const;
 
        /** Write details of the asset to a ASSETMAP stream.
         *  @param s Stream.
@@ -87,11 +86,11 @@ public:
 
        boost::filesystem::path path () const;
 
-       void set_directory (std::string d) {
+       void set_directory (boost::filesystem::path d) {
                _directory = d;
        }
 
-       void set_file_name (std::string f) {
+       void set_file_name (boost::filesystem::path f) {
                _file_name = f;
        }
 
@@ -130,13 +129,16 @@ public:
        virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)>) const;
 
 protected:
+
+       /** @return Interop PKL asdcpKind for the &lt;Type&gt; tag e.g. Picture, Sound etc. */
+       virtual std::string asdcp_kind () const = 0;
        
        std::string digest () const;
 
        /** Directory that our MXF or XML file is in */
        boost::filesystem::path _directory;
        /** Name of our MXF or XML file */
-       std::string _file_name;
+       boost::filesystem::path _file_name;
        /** Our UUID */
        std::string _uuid;
        /** The edit rate; this is normally equal to the number of video frames per second */