4th parameter of time is ticks (1 tick = 4ms) not milliseconds

[libdcp.git] / src / pkl.cc

diff --git a/src/pkl.cc b/src/pkl.cc
index b41fc1857e20197aa4629ab718c6e09c8860cb39..0ede1d57e08eafd3c6a46cfb4b8539744f6d57f3 100644 (file)
--- a/src/pkl.cc
+++ b/src/pkl.cc
@@ -1,6 +1,8 @@
+#include <iostream>
 #include "pkl.h"
 
 using namespace std;
+using namespace boost;
 using namespace libdcp;
 
 PKL::PKL (string file)
@@ -11,13 +13,7 @@ PKL::PKL (string file)
        issue_date = string_node ("IssueDate");
        issuer = string_node ("Issuer");
        creator = string_node ("Creator");
-       asset_list = sub_node<PKLAssetList> ("AssetList");
-}
-
-PKLAssetList::PKLAssetList (xmlpp::Node const * node)
-       : XMLNode (node)
-{
-       assets = sub_nodes<PKLAsset> ("Asset");
+       assets = sub_nodes<PKLAsset> ("AssetList", "Asset");
 }
 
 PKLAsset::PKLAsset (xmlpp::Node const * node)
@@ -26,7 +22,20 @@ PKLAsset::PKLAsset (xmlpp::Node const * node)
        id = string_node ("Id");
        annotation_text = optional_string_node ("AnnotationText");
        hash = string_node ("Hash");
-       size = int_node ("Size");
+       size = int64_node ("Size");
        type = string_node ("Type");
+       original_file_name = optional_string_node ("OriginalFileName");
 }
        
+shared_ptr<PKLAsset>
+PKL::asset_from_id (string id) const
+{
+       for (list<shared_ptr<PKLAsset> >::const_iterator i = assets.begin (); i != assets.end(); ++i) {
+               if ((*i)->id == id) {
+                       return *i;
+               }
+       }
+
+       return shared_ptr<PKLAsset> ();
+}
+