Merge.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index 99d5b411d901fb3477e093af22db2e3c98f75a46..b0bf6fcf98861634693658f5295940780baba402 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -14,7 +14,7 @@ CPL::CPL (string file)
        content_kind = kind_node ("ContentKind");
        content_version = sub_node<ContentVersion> ("ContentVersion");
        ignore_node ("RatingList");
-       reel_list = sub_node<ReelList> ("ReelList");
+       reels = sub_nodes<Reel> ("ReelList", "Reel");
 
        done ();
 }
@@ -27,13 +27,6 @@ ContentVersion::ContentVersion (xmlpp::Node const * node)
        done ();
 }
 
-ReelList::ReelList (xmlpp::Node const * node)
-       : XMLNode (node)
-{
-       reels = sub_nodes<Reel> ("Reel");
-       done ();
-}
-
 Reel::Reel (xmlpp::Node const * node)
        : XMLNode (node)
 {
@@ -58,9 +51,9 @@ MainPicture::MainPicture (xmlpp::Node const * node)
        id = string_node ("Id");
        annotation_text = string_node ("AnnotationText");
        edit_rate = fraction_node ("EditRate");
-       intrinsic_duration = int_node ("IntrinsicDuration");
-       entry_point = int_node ("EntryPoint");
-       duration = int_node ("Duration");
+       intrinsic_duration = int64_node ("IntrinsicDuration");
+       entry_point = int64_node ("EntryPoint");
+       duration = int64_node ("Duration");
        frame_rate = fraction_node ("FrameRate");
        screen_aspect_ratio = fraction_node ("ScreenAspectRatio");
 
@@ -73,9 +66,9 @@ MainSound::MainSound (xmlpp::Node const * node)
        id = string_node ("Id");
        annotation_text = string_node ("AnnotationText");
        edit_rate = fraction_node ("EditRate");
-       intrinsic_duration = int_node ("IntrinsicDuration");
-       entry_point = int_node ("EntryPoint");
-       duration = int_node ("Duration");
+       intrinsic_duration = int64_node ("IntrinsicDuration");
+       entry_point = int64_node ("EntryPoint");
+       duration = int64_node ("Duration");
 
        done ();
 }