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);
}
return true;
} catch (dcp::MXFFileError& e) {
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
}
return true;
} catch (dcp::MXFFileError& e) {
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
}
}
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 ()));
}
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());
+}
+
+DCPTime
+VideoMXFContent::approximate_length () const
+{
+ return DCPTime::from_frames (video->length_after_3d_combine(), 24);
}
void
-VideoMXFContent::add_properties (list<UserProperty>& p) const
+VideoMXFContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
{
+ Content::add_properties (film, p);
video->add_properties (p);
}