A couple of hacks to KDMs for testing by Dolby.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 4d92d3450703dbeda6f619f052196de5cf60df10..772ac717409a3cbdd12897229121a6ea1ddae8b5 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -36,12 +36,13 @@
 using std::string;
 using std::list;
 using std::cout;
+using std::max;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 Reel::Reel (boost::shared_ptr<const cxml::Node> node)
-       : Object (node->string_child ("Id"))
+       : Object (remove_urn_uuid (node->string_child ("Id")))
 {
        shared_ptr<cxml::Node> asset_list = node->node_child ("AssetList");
 
@@ -49,17 +50,17 @@ Reel::Reel (boost::shared_ptr<const cxml::Node> node)
        if (main_picture) {
                _main_picture.reset (new ReelMonoPictureAsset (main_picture));
        }
-       
+
        shared_ptr<cxml::Node> main_stereoscopic_picture = asset_list->optional_node_child ("MainStereoscopicPicture");
        if (main_stereoscopic_picture) {
                _main_picture.reset (new ReelStereoPictureAsset (main_stereoscopic_picture));
        }
-       
+
        shared_ptr<cxml::Node> main_sound = asset_list->optional_node_child ("MainSound");
        if (main_sound) {
                _main_sound.reset (new ReelSoundAsset (main_sound));
        }
-       
+
        shared_ptr<cxml::Node> main_subtitle = asset_list->optional_node_child ("MainSubtitle");
        if (main_subtitle) {
                _main_subtitle.reset (new ReelSubtitleAsset (main_subtitle));
@@ -75,7 +76,7 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
        xmlpp::Element* reel = node->add_child ("Reel");
        reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
        xmlpp::Element* asset_list = reel->add_child ("AssetList");
-       
+
        if (_main_picture && dynamic_pointer_cast<ReelMonoPictureAsset> (_main_picture)) {
                /* Mono pictures come before other stuff... */
                _main_picture->write_to_cpl (asset_list, standard);
@@ -94,7 +95,7 @@ Reel::write_to_cpl (xmlpp::Element* node, Standard standard) const
                _main_picture->write_to_cpl (asset_list, standard);
        }
 }
-       
+
 bool
 Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler note) const
 {
@@ -102,7 +103,7 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHand
                note (DCP_ERROR, "Reel: assets differ");
                return false;
        }
-       
+
        if (_main_picture && !_main_picture->equals (other->_main_picture, opt, note)) {
                return false;
        }
@@ -111,7 +112,7 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHand
                note (DCP_ERROR, "Reel: assets differ");
                return false;
        }
-       
+
        if (_main_sound && !_main_sound->equals (other->_main_sound, opt, note)) {
                return false;
        }
@@ -120,7 +121,7 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHand
                note (DCP_ERROR, "Reel: assets differ");
                return false;
        }
-       
+
        if (_main_subtitle && !_main_subtitle->equals (other->_main_subtitle, opt, note)) {
                return false;
        }
@@ -165,23 +166,41 @@ Reel::add (shared_ptr<ReelAsset> asset)
 }
 
 void
-Reel::resolve_refs (list<shared_ptr<Object> > objects)
+Reel::resolve_refs (list<shared_ptr<Asset> > assets)
 {
        if (_main_picture) {
-               _main_picture->asset_ref().resolve (objects);
+               _main_picture->asset_ref().resolve (assets);
        }
 
        if (_main_sound) {
-               _main_sound->asset_ref().resolve (objects);
+               _main_sound->asset_ref().resolve (assets);
        }
 
        if (_main_subtitle) {
-               _main_subtitle->asset_ref().resolve (objects);
+               _main_subtitle->asset_ref().resolve (assets);
 
                /* Interop subtitle handling is all special cases */
-               shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().object ());
+               shared_ptr<InteropSubtitleAsset> iop = dynamic_pointer_cast<InteropSubtitleAsset> (_main_subtitle->asset_ref().asset ());
                if (iop) {
-                       iop->resolve_fonts (objects);
+                       iop->resolve_fonts (assets);
                }
        }
 }
+
+int64_t
+Reel::duration () const
+{
+       int64_t d = 0;
+
+       if (_main_picture) {
+               d = max (d, _main_picture->duration ());
+       }
+       if (_main_sound) {
+               d = max (d, _main_sound->duration ());
+       }
+       if (_main_subtitle) {
+               d = max (d, _main_subtitle->duration ());
+       }
+
+       return d;
+}