Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index 4f69cb2e2301ed1fb76d2395b25b058934638dbd..0c905a624219eec3ce07527583ac0d6fd6065d4a 100644 (file)
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -35,6 +35,7 @@
 using std::list;
 using std::string;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
        : Content (path)
@@ -58,7 +59,7 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path)
                return true;
        } catch (dcp::MXFFileError& e) {
 
-       } catch (dcp::DCPReadError& e) {
+       } catch (dcp::ReadError& e) {
 
        }
 
@@ -68,7 +69,7 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path)
                return true;
        } catch (dcp::MXFFileError& e) {
 
-       } catch (dcp::DCPReadError& e) {
+       } catch (dcp::ReadError& e) {
 
        }
 
@@ -119,12 +120,19 @@ VideoMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const
 DCPTime
 VideoMXFContent::full_length (shared_ptr<const Film> film) const
 {
-       FrameRateChange const frc (active_video_frame_rate(film), 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);
 }