X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.h;h=e8867ae551f7aa65363b3e53a87b47c79a5792cc;hb=59886567974bd3e79d30a4a9425d86d50bf425f3;hp=3ba0a0cf49930baebcff6bc95ceb19d7c4e1aecf;hpb=2489080f9a5d2891da0fc313b2c0ac1450a630ad;p=libdcp.git

diff --git a/src/asset.h b/src/asset.h
index 3ba0a0cf..e8867ae5 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,76 +18,60 @@
 */
 
 /** @file  src/asset.h
- *  @brief Parent class for assets of DCPs.
- */
+ *  @brief Asset class.
+ */ 
 
 #ifndef LIBDCP_ASSET_H
 #define LIBDCP_ASSET_H
 
-#include <string>
-#include <list>
-#include <boost/filesystem.hpp>
+#include "object.h"
 #include "types.h"
+#include <boost/filesystem.hpp>
+#include <boost/function.hpp>
 
-namespace ASDCP {
-	class WriterInfo;
+namespace xmlpp {
+	class Node;
 }
 
-namespace libdcp
-{
+namespace dcp {
 
-/** @brief Parent class for assets of DCPs
+/** @class Asset
+ *  @brief Parent class for DCP assets, i.e. picture/sound/subtitles and CPLs.
  *
- *  These are collections of pictures or sound.
+ *  Note that this class is not used for ReelAssets; they are just for the metadata
+ *  that gets put into <Reel>s.
  */
-class Asset
+class Asset : public Object
 {
 public:
-	/** Construct an Asset.
-	 *  @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 (std::string directory, std::string file_name = "");
-
-	virtual ~Asset() {}
+	Asset ();
+	Asset (boost::filesystem::path file);
+	Asset (std::string id);
 
-	/** Write details of the asset to a CPL stream.
-	 *  @param s Stream.
-	 */
-	virtual void write_to_cpl (std::ostream& s) const = 0;
-
-	/** Write details of the asset to a PKL stream.
-	 *  @param s Stream.
+	virtual std::string pkl_type () const = 0;
+	virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
+	
+	/** Write details of the asset to a PKL AssetList node.
+	 *  @param node Parent node.
 	 */
-	void write_to_pkl (std::ostream& s) const;
+	void write_to_pkl (xmlpp::Node* node) const;
+	void write_to_assetmap (xmlpp::Node* node) const;
 
-	/** Write details of the asset to a ASSETMAP stream.
-	 *  @param s Stream.
-	 */
-	void write_to_assetmap (std::ostream& s) const;
+	boost::filesystem::path file () const {
+		return _file;
+	}
 
-	std::string uuid () const {
-		return _uuid;
+	void set_file (boost::filesystem::path file) {
+		_file = file;
 	}
 
-	boost::filesystem::path path () const;
-	
-	virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const = 0;
+	std::string hash () const;
 
 protected:
+	friend class MXFWriter;
 	
-	std::string digest () const;
-
-	/** Directory that our MXF or XML file is in */
-	std::string _directory;
-	/** Name of our MXF or XML file */
-	std::string _file_name;
-	/** Our UUID */
-	std::string _uuid;
-
-private:	
-	/** Digest of our MXF or XML file */
-	mutable std::string _digest;
+	boost::filesystem::path _file;
+	mutable std::string _hash;
 };
 
 }