Add another believed-correct subtitle timing fix.

[dcpomatic.git] / src / lib / atmos_mxf_content.h

diff --git a/src/lib/atmos_mxf_content.h b/src/lib/atmos_mxf_content.h
index 0f5225c2ec7fa8ad871862b05d10399177a48a43..57f041774c1b3776926545b7b77c025c2c872c33 100644 (file)
--- a/src/lib/atmos_mxf_content.h
+++ b/src/lib/atmos_mxf_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,25 +18,30 @@
 
 */
 
+
 #include "content.h"
+#include <memory>
+
 
 class AtmosMXFContent : public Content
 {
 public:
-       AtmosMXFContent (boost::shared_ptr<const Film> film, boost::filesystem::path path);
-       AtmosMXFContent (boost::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version);
+       AtmosMXFContent (boost::filesystem::path path);
+       AtmosMXFContent (cxml::ConstNodePtr node, int version);
 
-       boost::shared_ptr<AtmosMXFContent> shared_from_this () {
-               return boost::dynamic_pointer_cast<AtmosMXFContent> (Content::shared_from_this ());
+       std::shared_ptr<AtmosMXFContent> shared_from_this () {
+               return std::dynamic_pointer_cast<AtmosMXFContent> (Content::shared_from_this());
        }
 
-       void examine (boost::shared_ptr<Job> job);
-       std::string summary () const;
-       void as_xml (xmlpp::Node* node, bool with_path) const;
-       DCPTime full_length () const;
+       std::shared_ptr<const AtmosMXFContent> shared_from_this () const {
+               return std::dynamic_pointer_cast<const AtmosMXFContent> (Content::shared_from_this());
+       }
 
-       static bool valid_mxf (boost::filesystem::path path);
+       void examine (std::shared_ptr<const Film> film, std::shared_ptr<Job> job) override;
+       std::string summary () const override;
+       void as_xml (xmlpp::Node* node, bool with_path) const override;
+       dcpomatic::DCPTime full_length (std::shared_ptr<const Film> film) const override;
+       dcpomatic::DCPTime approximate_length () const override;
 
-private:
-       Frame _length;
+       static bool valid_mxf (boost::filesystem::path path);
 };