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

diff --git a/src/asset.h b/src/asset.h
index dbe3deba..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,139 +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 "object.h"
+#include "types.h"
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>
-#include <libxml++/libxml++.h>
-#include "types.h"
-
-namespace ASDCP {
-	class WriterInfo;
-}
 
 namespace xmlpp {
-	class Element;
+	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 (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;
+	Asset ();
+	Asset (boost::filesystem::path file);
+	Asset (std::string id);
 
+	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 p Parent node.
-	 */
-	void write_to_pkl (xmlpp::Node *) const;
-
-	/** Write details of the asset to a ASSETMAP stream.
-	 *  @param s Stream.
+	 *  @param node Parent node.
 	 */
-	void write_to_assetmap (xmlpp::Node *) const;
-
-	/** Compute the digest for this asset.  Calling this is optional: if
-	 *  it is not called, the digest will be computed when required.  However,
-	 *  calling this method allows the caller to see the progress of the
-	 *  computation, which can be long for large assets.
-	 *  @param Called with progress between 0 and 1.
-	 */
-	void compute_digest (boost::function<void (float)> progress);
-
-	std::string uuid () const {
-		return _uuid;
-	}
-
-	boost::filesystem::path path () const;
-
-	void set_directory (boost::filesystem::path d) {
-		_directory = d;
-	}
-
-	void set_file_name (boost::filesystem::path f) {
-		_file_name = f;
-	}
-
-	int entry_point () const {
-		return _entry_point;
-	}
-
-	int duration () const {
-		return _duration;
-	}
-	
-	int intrinsic_duration () const {
-		return _intrinsic_duration;
-	}
-	
-	int edit_rate () const {
-		return _edit_rate;
-	}
-
-	void set_entry_point (int e) {
-		_entry_point = e;
-	}
-	
-	void set_duration (int d) {
-		_duration = d;
-	}
+	void write_to_pkl (xmlpp::Node* node) const;
+	void write_to_assetmap (xmlpp::Node* node) const;
 
-	void set_intrinsic_duration (int d) {
-		_intrinsic_duration = d;
+	boost::filesystem::path file () const {
+		return _file;
 	}
 
-	void set_edit_rate (int r) {
-		_edit_rate = r;
+	void set_file (boost::filesystem::path file) {
+		_file = file;
 	}
 
-	virtual bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)>) const;
+	std::string hash () const;
 
 protected:
+	friend class MXFWriter;
 	
-	std::string digest () const;
-
-	/** Directory that our MXF or XML file is in */
-	boost::filesystem::path _directory;
-	/** Name of our MXF or XML file */
-	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 */
-	int _edit_rate;
-	/** Start point to present in frames */
-	int _entry_point;
-	/** Total length in frames */
-	int _intrinsic_duration;
-	/** Length to present in frames */
-	int _duration;
-
-private:	
-	/** Digest of our MXF or XML file */
-	mutable std::string _digest;
+	boost::filesystem::path _file;
+	mutable std::string _hash;
 };
 
 }