From ff896d5f5ec20e1371b423bb746c32fa55cc126a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 16 Dec 2015 20:20:47 +0000
Subject: Ref does not need to be a template since it's always used for Asset.

---
 src/dcp.cc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/dcp.cc')

diff --git a/src/dcp.cc b/src/dcp.cc
index 53d5dd39..40d288b8 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -181,7 +181,15 @@ DCP::read (bool keep_going, ReadErrors* errors)
 	}
 
 	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
-		i->resolve_refs (list_of_type<Asset, Object> (other_assets));
+		i->resolve_refs (other_assets);
+	}
+}
+
+void
+DCP::resolve_refs (list<shared_ptr<Asset> > assets)
+{
+	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
+		i->resolve_refs (assets);
 	}
 }
 
@@ -429,7 +437,7 @@ DCP::assets () const
 	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
 		assets.push_back (i);
 		BOOST_FOREACH (shared_ptr<const ReelAsset> j, i->reel_assets ()) {
-			shared_ptr<Asset> o = j->asset_ref().object ();
+			shared_ptr<Asset> o = j->asset_ref().asset ();
 			assets.push_back (o);
 			/* More Interop special-casing */
 			shared_ptr<InteropSubtitleAsset> sub = dynamic_pointer_cast<InteropSubtitleAsset> (o);
-- 
cgit v1.2.3