Various work.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index 495b14a4..a5b0c6e4 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -108,8 +108,8 @@ DCP::write_pkl (string pkl_uuid, bool interop, XMLMetadata const & metadata, sha
 	pkl->add_child("Creator")->add_child_text (metadata.creator);
 
 	xmlpp::Element* asset_list = pkl->add_child("AssetList");
-	list<shared_ptr<const ContentAsset> > a = assets ();
-	for (list<shared_ptr<const ContentAsset> >::const_iterator i = a.begin(); i != a.end(); ++i) {
+	list<shared_ptr<const Content> > a = assets ();
+	for (list<shared_ptr<const Content> >::const_iterator i = a.begin(); i != a.end(); ++i) {
 		(*i)->write_to_pkl (asset_list);
 	}
 	
@@ -191,8 +191,8 @@ DCP::write_assetmap (string pkl_uuid, int pkl_length, bool interop, XMLMetadata
 		(*i)->write_to_assetmap (asset_list);
 	}
 
-	list<shared_ptr<const ContentAsset> > a = assets ();
-	for (list<shared_ptr<const ContentAsset> >::const_iterator i = a.begin(); i != a.end(); ++i) {
+	list<shared_ptr<const Content> > a = assets ();
+	for (list<shared_ptr<const Content> >::const_iterator i = a.begin(); i != a.end(); ++i) {
 		(*i)->write_to_assetmap (asset_list);
 	}
 
@@ -321,17 +321,17 @@ DCP::add_cpl (shared_ptr<CPL> cpl)
 class AssetComparator
 {
 public:
-	bool operator() (shared_ptr<const ContentAsset> a, shared_ptr<const ContentAsset> b) {
-		return a->uuid() < b->uuid();
+	bool operator() (shared_ptr<const Content> a, shared_ptr<const Content> b) {
+		return a->id() < b->id();
 	}
 };
 
-list<shared_ptr<const ContentAsset> >
+list<shared_ptr<const Content> >
 DCP::assets () const
 {
-	list<shared_ptr<const ContentAsset> > a;
+	list<shared_ptr<const Content> > a;
 	for (list<shared_ptr<CPL> >::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-		list<shared_ptr<const ContentAsset> > t = (*i)->assets ();
+		list<shared_ptr<const Content> > t = (*i)->assets ();
 		a.merge (t);
 	}