Merge tag 'v1.8.98' into v1.9.x

[libdcp.git] / src / reel_markers_asset.h

diff --git a/src/reel_markers_asset.h b/src/reel_markers_asset.h
index 5b33bbf23dd3fdc7a912e1ecddf68f37eb1836ba..1e87957af917f4626996ce9e32a11ec1cbe4b4ec 100644 (file)
--- a/src/reel_markers_asset.h
+++ b/src/reel_markers_asset.h
@@ -32,6 +32,11 @@
 */
 
 
+/** @file  src/reel_markers_asset.cc
+ *  @brief ReelMarkersAsset class
+ */
+
+
 #include "reel_asset.h"
 #include "dcp_time.h"
 #include <map>
@@ -43,11 +48,11 @@ namespace dcp {
 class ReelMarkersAsset : public ReelAsset
 {
 public:
-       ReelMarkersAsset (Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
+       ReelMarkersAsset (Fraction edit_rate, int64_t intrinsic_duration);
        explicit ReelMarkersAsset (std::shared_ptr<const cxml::Node>);
 
-       xmlpp::Node* write_to_cpl (xmlpp::Node* node, Standard standard) const;
-       bool equals (std::shared_ptr<const ReelMarkersAsset>, EqualityOptions, NoteHandler) const;
+       xmlpp::Element* write_to_cpl(xmlpp::Element* node, Standard standard) const override;
+       bool equals(std::shared_ptr<const ReelMarkersAsset>, EqualityOptions const&, NoteHandler) const;
 
        void set (Marker, Time);
        void unset (Marker);
@@ -57,7 +62,7 @@ public:
        }
 
 protected:
-       std::string cpl_node_name (Standard) const;
+       std::string cpl_node_name (Standard) const override;
 
 private:
        std::map<Marker, Time> _markers;