From 2e64e69c8d7836d14e059c474bb6bd667e7bb52f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 2 Jul 2013 14:00:57 +0100
Subject: More master merge bits.

---
 src/cpl.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/cpl.h')

diff --git a/src/cpl.h b/src/cpl.h
index f9814337..3f483504 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -34,7 +34,8 @@ namespace parse {
 class Asset;
 class Reel;
 class XMLMetadata;
-	class Encryption;
+class MXFMetadata;
+class Encryption;
 	
 /** @brief A CPL within a DCP */
 class CPL
@@ -86,7 +87,9 @@ public:
 		std::string const &,
 		boost::shared_ptr<const Certificate>,
 		boost::posix_time::ptime from,
-		boost::posix_time::ptime until
+		boost::posix_time::ptime until,
+		MXFMetadata const &,
+		XMLMetadata const &
 		) const;
 	
 private:
-- 
cgit v1.2.3