X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_content.cc;h=a8a301f221bf9b68040a95dec78e079a9df01a9b;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=9d2af1a32923c966e08c1b85343de6b24af17276;hpb=673ba43fb66eb0dee43807501753749f144254a7;p=dcpomatic.git diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc index 9d2af1a32..a8a301f22 100644 --- 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) { } @@ -130,7 +131,8 @@ VideoMXFContent::approximate_length () const } void -VideoMXFContent::add_properties (list& p) const +VideoMXFContent::add_properties (shared_ptr film, list& p) const { + Content::add_properties (film, p); video->add_properties (p); }