Add some new channels to the enum.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index bda83531ac8228e674ed9da679447ebc997cb157..453a3163184d182ad0403153de9c96f225df5f88 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -51,11 +51,17 @@
 #include "reel_closed_caption_asset.h"
 #include <libxml++/nodes/element.h>
 #include <boost/foreach.hpp>
+#include <stdint.h>
+
+/* Centos 6 does not have this */
+#ifndef INT64_MAX
+#define INT64_MAX 0x7fffffffffffffff
+#endif
 
 using std::string;
 using std::list;
 using std::cout;
-using std::max;
+using std::min;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using namespace dcp;
@@ -113,7 +119,7 @@ void
 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());
+       reel->add_child("Id")->add_child_text("urn:uuid:" + _id);
        xmlpp::Element* asset_list = reel->add_child ("AssetList");
 
        if (_main_markers) {
@@ -282,6 +288,26 @@ Reel::add (shared_ptr<ReelAsset> asset)
        }
 }
 
+list<shared_ptr<ReelAsset> >
+Reel::assets () const
+{
+       list<shared_ptr<ReelAsset> > a;
+       if (_main_picture) {
+               a.push_back (_main_picture);
+       }
+       if (_main_sound) {
+               a.push_back (_main_sound);
+       }
+       if (_main_subtitle) {
+               a.push_back (_main_subtitle);
+       }
+       std::copy (_closed_captions.begin(), _closed_captions.end(), back_inserter(a));
+       if (_atmos) {
+               a.push_back (_atmos);
+       }
+       return a;
+}
+
 void
 Reel::resolve_refs (list<shared_ptr<Asset> > assets)
 {
@@ -325,26 +351,29 @@ Reel::resolve_refs (list<shared_ptr<Asset> > assets)
 int64_t
 Reel::duration () const
 {
-       int64_t d = 0;
-
        if (_main_picture) {
-               d = max (d, _main_picture->duration ());
+               return _main_picture->actual_duration();
        }
+
+       int64_t d = INT64_MAX;
+
        if (_main_sound) {
-               d = max (d, _main_sound->duration ());
+               d = min (d, _main_sound->actual_duration());
        }
        if (_main_subtitle) {
-               d = max (d, _main_subtitle->duration ());
+               d = min (d, _main_subtitle->actual_duration());
        }
        if (_main_markers) {
-               d = max (d, _main_markers->duration ());
+               d = min (d, _main_markers->actual_duration());
        }
        BOOST_FOREACH (shared_ptr<ReelClosedCaptionAsset> i, _closed_captions) {
-               d = max (d, i->duration());
+               d = min (d, i->actual_duration());
        }
        if (_atmos) {
-               d = max (d, _atmos->duration ());
+               d = min (d, _atmos->actual_duration());
        }
 
+       DCP_ASSERT (d < INT64_MAX);
+
        return d;
 }