From d8c9cbec9d87f28da338350880b7618b94f4da81 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 31 Jul 2012 00:07:08 +0100 Subject: Bits. --- src/asset_map.cc | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/asset_map.cc') diff --git a/src/asset_map.cc b/src/asset_map.cc index b5e621d4..11e80284 100644 --- a/src/asset_map.cc +++ b/src/asset_map.cc @@ -4,20 +4,14 @@ using namespace std; using namespace libdcp; AssetMap::AssetMap (string file) - : XMLFile (file) + : XMLFile (file, "AssetMap") { id = string_node ("Id"); creator = string_node ("Creator"); volume_count = int_node ("VolumeCount"); issue_date = string_node ("IssueDate"); issuer = string_node ("Issuer"); - asset_list = sub_node ("AssetMapAssetList"); -} - -AssetMapAssetList::AssetMapAssetList (xmlpp::Node const * node) - : XMLNode (node) -{ - assets = sub_nodes ("Asset"); + assets = sub_nodes ("AssetList", "Asset"); } AssetMapAsset::AssetMapAsset (xmlpp::Node const * node) @@ -25,13 +19,7 @@ AssetMapAsset::AssetMapAsset (xmlpp::Node const * node) { id = string_node ("Id"); packing_list = optional_string_node ("PackingList"); - chunk_list = sub_node ("ChunkList"); -} - -ChunkList::ChunkList (xmlpp::Node const * node) - : XMLNode (node) -{ - chunks = sub_nodes ("Chunk"); + chunks = sub_nodes ("ChunkList", "Chunk"); } Chunk::Chunk (xmlpp::Node const * node) -- cgit v1.2.3