Fix various bugs in subtitle/ccap verification.

[libdcp.git] / src / reel_markers_asset.cc

diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc
index 52151868e33d31cf49df67c1ef762ffcaad57e3e..c6339df5dd6969dae923b920cd3861ce697b02bb 100644 (file)
--- a/src/reel_markers_asset.cc
+++ b/src/reel_markers_asset.cc
@@ -32,6 +32,11 @@
 */
 
 
+/** @file  src/reel_markers_asset.cc
+ *  @brief ReelMarkersAsset class
+ */
+
+
 #include "reel_markers_asset.h"
 #include "raw_convert.h"
 #include "dcp_assert.h"
@@ -88,9 +93,9 @@ ReelMarkersAsset::unset (Marker m)
 optional<Time>
 ReelMarkersAsset::get (Marker m) const
 {
-       map<Marker, Time>::const_iterator i = _markers.find (m);
+       auto i = _markers.find (m);
        if (i == _markers.end ()) {
-               return optional<Time>();
+               return {};
        }
        return i->second;
 }
@@ -105,7 +110,7 @@ ReelMarkersAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
        for (auto const& i: _markers) {
                auto m = ml->add_child("Marker");
                m->add_child("Label")->add_child_text(marker_to_string(i.first));
-               m->add_child("Offset")->add_child_text(raw_convert<string>(i.second.as_editable_units(tcr)));
+               m->add_child("Offset")->add_child_text(raw_convert<string>(i.second.as_editable_units_ceil(tcr)));
        }
 
        return asset;