X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_content.cc;h=0c905a624219eec3ce07527583ac0d6fd6065d4a;hp=1f416312233f3efe21edae87ccfbc248abfa2d3a;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23

diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index 1f4163122..0c905a624 100644
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -24,6 +24,7 @@
 #include "job.h"
 #include "film.h"
 #include "compose.hpp"
+#include <asdcp/KM_log.h>
 #include <dcp/mono_picture_asset.h>
 #include <dcp/stereo_picture_asset.h>
 #include <dcp/exceptions.h>
@@ -34,15 +35,16 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
-VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, boost::filesystem::path path)
-	: Content (film, path)
+VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
+	: Content (path)
 {
 
 }
 
-VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-	: Content (film, node)
+VideoMXFContent::VideoMXFContent (cxml::ConstNodePtr node, int version)
+	: Content (node)
 {
 	video = VideoContent::from_xml (this, node, version);
 }
@@ -50,37 +52,43 @@ VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, cxml::ConstNodePt
 bool
 VideoMXFContent::valid_mxf (boost::filesystem::path path)
 {
+	Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
 	try {
 		shared_ptr<dcp::MonoPictureAsset> mp (new dcp::MonoPictureAsset (path));
 		return true;
 	} catch (dcp::MXFFileError& e) {
 
-	} catch (dcp::DCPReadError& e) {
+	} catch (dcp::ReadError& e) {
 
 	}
 
 	try {
+		Kumu::DefaultLogSink().SetFilterFlag(0);
 		shared_ptr<dcp::StereoPictureAsset> sp (new dcp::StereoPictureAsset (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
-VideoMXFContent::examine (shared_ptr<Job> job)
+VideoMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
 	job->set_progress_unknown ();
 
-	Content::examine (job);
+	Content::examine (film, job);
 
 	video.reset (new VideoContent (this));
 	shared_ptr<VideoMXFExaminer> examiner (new VideoMXFExaminer (shared_from_this ()));
 	video->take_from_examiner (examiner);
+	video->unset_colour_conversion ();
 }
 
 string
@@ -110,20 +118,21 @@ VideoMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 }
 
 DCPTime
-VideoMXFContent::full_length () const
+VideoMXFContent::full_length (shared_ptr<const Film> film) const
 {
-	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
-	return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate());
+	FrameRateChange const frc (film, shared_from_this());
+	return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate());
 }
 
-void
-VideoMXFContent::add_properties (list<UserProperty>& p) const
+DCPTime
+VideoMXFContent::approximate_length () const
 {
-	video->add_properties (p);
+	return DCPTime::from_frames (video->length_after_3d_combine(), 24);
 }
 
 void
-VideoMXFContent::set_default_colour_conversion ()
+VideoMXFContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
-	video->unset_colour_conversion ();
+	Content::add_properties (film, p);
+	video->add_properties (p);
 }