X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fasset.h;h=f69be5a168f38c32c68ace428f389669408cc4ca;hb=f2f2a2afc393dcaee747b97173d71a622d05d910;hp=91661a46e5395292a37bf6f305ce617c398fa709;hpb=6cac3a738e897fcc326ba70564f02c8dfa2ef900;p=libdcp.git

diff --git a/src/asset.h b/src/asset.h
index 91661a46..f69be5a1 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/asset.h
@@ -26,9 +40,11 @@
 
 #include "object.h"
 #include "types.h"
+#include "pkl.h"
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
+#include <boost/optional.hpp>
 
 namespace xmlpp {
 	class Node;
@@ -48,7 +64,7 @@ class Asset : public Object
 {
 public:
 	Asset ();
-	Asset (boost::filesystem::path file);
+	explicit Asset (boost::filesystem::path file);
 	Asset (std::string id, boost::filesystem::path file);
 
 	virtual bool equals (
@@ -62,14 +78,10 @@ public:
 	 */
 	void write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const;
 
-	/** Write details of the asset to a PKL AssetList node.
-	 *  @param node Parent node.
-	 *  @param standard Standard to use.
-	 */
-	void write_to_pkl (xmlpp::Node* node, Standard standard) const;
+	void add_to_pkl (boost::shared_ptr<PKL> pkl, boost::filesystem::path root) const;
 
-	/** @return the most recent disk file used to read or write this asset; may be empty */
-	boost::filesystem::path file () const {
+	/** @return the most recent disk file used to read or write this asset, if there is one */
+	boost::optional<boost::filesystem::path> file () const {
 		return _file;
 	}
 
@@ -78,15 +90,21 @@ public:
 	/** @return the hash of this asset's file */
 	std::string hash (boost::function<void (float)> progress = 0) const;
 
+	void set_hash (std::string hash);
+
 protected:
+
+	/** The most recent disk file used to read or write this asset */
+	mutable boost::optional<boost::filesystem::path> _file;
+
+private:
 	friend struct ::asset_test;
 
+	/** @return type string for PKLs for this asset */
 	virtual std::string pkl_type (Standard standard) const = 0;
 
-	/** The most recent disk file used to read or write this asset; may be empty */
-	mutable boost::filesystem::path _file;
-	/** Hash of _file, or empty if the hash has not yet been computed */
-	mutable std::string _hash;
+	/** Hash of _file if it has been computed */
+	mutable boost::optional<std::string> _hash;
 };
 
 }