projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DCPReadError -> ReadError in libdcp.
[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 9d2af1a32923c966e08c1b85343de6b24af17276..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 std::list;
using std::string;
using boost::shared_ptr;
+using namespace dcpomatic;
VideoMXFContent::VideoMXFContent (boost::filesystem::path path)
: Content (path)
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) {
return true;
} catch (dcp::MXFFileError& e) {
- } catch (dcp::
DCP
ReadError& e) {
+ } catch (dcp::ReadError& e) {
}
}
@@
-68,7
+69,7
@@
VideoMXFContent::valid_mxf (boost::filesystem::path path)
return true;
} catch (dcp::MXFFileError& e) {
return true;
} catch (dcp::MXFFileError& e) {
- } catch (dcp::
DCP
ReadError& e) {
+ } catch (dcp::ReadError& e) {
}
}
@@
-130,7
+131,8
@@
VideoMXFContent::approximate_length () const
}
void
}
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);
}
video->add_properties (p);
}