C++11 tidying.

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

diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index 2fd9ead068cf3f9130afcd0d9efe9ec486277e19..82c20e88f7bd8e7c723e49216b1d4aeeabe3bc4d 100644 (file)
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -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,76 +18,104 @@
 
 */
 
+
+#include "atmos_content.h"
 #include "atmos_mxf_content.h"
-#include "job.h"
-#include "film.h"
 #include "compose.hpp"
+#include "film.h"
+#include "job.h"
+#include <asdcp/KM_log.h>
 #include <dcp/atmos_asset.h>
 #include <dcp/exceptions.h>
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
+
 using std::list;
+using std::make_shared;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using namespace dcpomatic;
 
-AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, boost::filesystem::path path)
-       : Content (film, path)
+
+AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
+       : Content (path)
 {
 
 }
 
-AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int)
-       : Content (film, node)
-{
 
+AtmosMXFContent::AtmosMXFContent (cxml::ConstNodePtr node, int)
+       : Content (node)
+{
+       atmos = AtmosContent::from_xml (this, node);
 }
 
+
 bool
 AtmosMXFContent::valid_mxf (boost::filesystem::path path)
 {
+       Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
        try {
-               shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path));
+               dcp::AtmosAsset a (path);
                return true;
        } catch (dcp::MXFFileError& e) {
 
-       } catch (dcp::DCPReadError& e) {
+       } catch (dcp::ReadError& e) {
 
        }
 
+       Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
        return false;
 }
 
+
 void
-AtmosMXFContent::examine (shared_ptr<Job> job)
+AtmosMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
        job->set_progress_unknown ();
-       Content::examine (job);
-       shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path(0)));
+       Content::examine (film, job);
+       auto a = make_shared<dcp::AtmosAsset>(path(0));
 
        {
                boost::mutex::scoped_lock lm (_mutex);
-               _length = a->intrinsic_duration ();
+               atmos = make_shared<AtmosContent>(this);
+               atmos->set_length (a->intrinsic_duration());
+               atmos->set_edit_rate (a->edit_rate());
        }
 }
 
+
 string
 AtmosMXFContent::summary () const
 {
        return String::compose (_("%1 [Atmos]"), path_summary());
 }
 
+
 void
 AtmosMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
-       node->add_child("Type")->add_child_text ("AtmosMXF");
+       node->add_child("Type")->add_child_text("AtmosMXF");
        Content::as_xml (node, with_paths);
+       atmos->as_xml (node);
+}
+
+
+DCPTime
+AtmosMXFContent::full_length (shared_ptr<const Film> film) const
+{
+       FrameRateChange const frc (film, shared_from_this());
+       return DCPTime::from_frames (llrint(atmos->length() * frc.factor()), film->video_frame_rate());
 }
 
+
 DCPTime
-AtmosMXFContent::full_length () const
+AtmosMXFContent::approximate_length () const
 {
-       FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
-       return DCPTime::from_frames (llrint (_length * frc.factor()), film()->video_frame_rate());
+       return DCPTime::from_frames (atmos->length(), 24);
 }