X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fcpl.h;h=4219c523268d6326fc6d0aceba6bcb7ed5fbe685;hb=880c6f67ca3637c54c97c51081e0649743292af3;hp=fe123fd3d3cc5dc38281f89d49cf4da3c8e7918a;hpb=57b862d997857868d0c3c91a9776f854b62c6b56;p=libdcp.git

diff --git a/src/cpl.h b/src/cpl.h
index fe123fd3..4219c523 100644
--- a/src/cpl.h
+++ b/src/cpl.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/cpl.h
@@ -29,7 +43,6 @@
 #include "key.h"
 #include "asset.h"
 #include "metadata.h"
-#include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/optional.hpp>
@@ -52,7 +65,7 @@ class CPL : public Asset
 {
 public:
 	CPL (std::string annotation_text, ContentKind content_kind);
-	CPL (boost::filesystem::path file);
+	explicit CPL (boost::filesystem::path file);
 
 	bool equals (
 		boost::shared_ptr<const Asset> other,
@@ -111,7 +124,13 @@ public:
 		boost::shared_ptr<const CertificateChain>
 		) const;
 
-	void resolve_refs (std::list<boost::shared_ptr<Object> >);
+	void resolve_refs (std::list<boost::shared_ptr<Asset> >);
+
+	int64_t duration () const;
+
+	boost::optional<Standard> standard () const {
+		return _standard;
+	}
 
 protected:
 	/** @return type string for PKLs for this asset */
@@ -128,6 +147,9 @@ private:
 	std::string _content_version_id;            ///< &lt;Id&gt; in &lt;ContentVersion&gt;
 	std::string _content_version_label_text;    ///< &lt;LabelText&gt; in &lt;ContentVersion&gt;
 	std::list<boost::shared_ptr<Reel> > _reels;
+
+	/** Standard of CPL that was read in */
+	boost::optional<Standard> _standard;
 };
 
 }