Tell user we need a KDM when we have none, and content is encrypted.

[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 def58c5ebb3a5a7bc0e69dcccc2df31be1ed82b0..a8a301f221bf9b68040a95dec78e079a9df01a9b 100644 (file)
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -34,7 +34,8 @@
 
 using std::list;
 using std::string;
-using boost::shared_ptr;
+using std::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) {
 
        }
 
@@ -123,8 +124,15 @@ VideoMXFContent::full_length (shared_ptr<const Film> film) const
        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);
 }