Basics of OV/supplemental support when reading.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index a69a5198..b9f43472 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -53,6 +53,8 @@ using std::list;
 using std::stringstream;
 using std::ofstream;
 using std::ostream;
+using std::copy;
+using std::back_inserter;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using namespace libdcp;
@@ -269,8 +271,10 @@ DCP::read (bool require_mxfs)
 	/* Cross-check */
 	/* XXX */
 
+	_asset_maps.push_back (asset_map);
+
 	for (list<string>::iterator i = files.cpls.begin(); i != files.cpls.end(); ++i) {
-		_cpls.push_back (shared_ptr<CPL> (new CPL (_directory, *i, asset_map, require_mxfs)));
+		_cpls.push_back (shared_ptr<CPL> (new CPL (_directory, *i, _asset_maps, require_mxfs)));
 	}
 }
 
@@ -349,3 +353,9 @@ DCP::add_kdm (KDM const & kdm)
 		}
 	}
 }
+
+void
+DCP::add_assets_from (DCP const & ov)
+{
+	copy (ov._asset_maps.begin(), ov._asset_maps.end(), back_inserter (_asset_maps));
+}