From a9e6a22b0462451f1e533082ba588a2cf4ba2f86 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 27 Aug 2013 22:27:02 +0100
Subject: Fix paths in OV DCP searches.

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

(limited to 'src/cpl.h')

diff --git a/src/cpl.h b/src/cpl.h
index 57d4373f..95bcd03f 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -24,6 +24,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/optional.hpp>
 #include <libxml++/libxml++.h>
 #include "types.h"
 #include "certificates.h"
@@ -47,7 +48,7 @@ class CPL
 {
 public:
 	CPL (std::string directory, std::string name, ContentKind content_kind, int length, int frames_per_second);
-	CPL (std::string directory, std::string file, std::list<boost::shared_ptr<const parse::AssetMap> > asset_maps, bool require_mxfs = true);
+	CPL (std::string directory, std::string file, std::list<PathAssetMap> asset_maps, bool require_mxfs = true);
 
 	void add_reel (boost::shared_ptr<Reel> reel);
 	
@@ -107,7 +108,7 @@ public:
 	void add_kdm (KDM const &);
 	
 private:
-	boost::shared_ptr<parse::AssetMapAsset> asset_from_id (std::list<boost::shared_ptr<const parse::AssetMap> > asset_maps, std::string id) const;
+	std::pair<std::string, boost::shared_ptr<const parse::AssetMapAsset> > asset_from_id (std::list<PathAssetMap>, std::string id) const;
 	
 	std::string _directory;
 	/** the name of the DCP */
-- 
cgit v1.2.3