#include "job.h"
#include "film.h"
#include "compose.hpp"
+#include <asdcp/KM_log.h>
#include <dcp/atmos_asset.h>
#include <dcp/exceptions.h>
#include <libxml++/libxml++.h>
-#include <boost/make_shared.hpp>
#include "i18n.h"
using std::list;
using std::string;
using boost::shared_ptr;
-using boost::make_shared;
+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)
{
}
bool
AtmosMXFContent::valid_mxf (boost::filesystem::path path)
{
+ Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
try {
- shared_ptr<dcp::AtmosAsset> a = make_shared<dcp::AtmosAsset> (path);
+ shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (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 = make_shared<dcp::AtmosAsset> (path(0));
+ Content::examine (film, job);
+ shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path(0)));
{
boost::mutex::scoped_lock lm (_mutex);
}
void
-AtmosMXFContent::as_xml (xmlpp::Node* node) const
+AtmosMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
{
node->add_child("Type")->add_child_text ("AtmosMXF");
- Content::as_xml (node);
+ Content::as_xml (node, with_paths);
+}
+
+DCPTime
+AtmosMXFContent::full_length (shared_ptr<const Film> film) const
+{
+ FrameRateChange const frc (film, shared_from_this());
+ return DCPTime::from_frames (llrint (_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 (_length, 24);
}