diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-17 20:23:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-17 20:23:43 +0000 |
| commit | f150c837cdc6eeee8f61e743586ddbaf2a8c8010 (patch) | |
| tree | f41d9caa339762701e462ce3dd64b786481d2909 /src/mxf_asset.cc | |
| parent | 828c320df8c56208a8834971f5d937ce06a4edf2 (diff) | |
Replace length with intrinsic_duration.
Diffstat (limited to 'src/mxf_asset.cc')
| -rw-r--r-- | src/mxf_asset.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc index 7e40f0e0..338d125f 100644 --- a/src/mxf_asset.cc +++ b/src/mxf_asset.cc @@ -36,12 +36,12 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using namespace libdcp; -MXFAsset::MXFAsset (string directory, string file_name, boost::signals2::signal<void (float)>* progress, int fps, int length) +MXFAsset::MXFAsset (string directory, string file_name, boost::signals2::signal<void (float)>* progress, int fps, int intrinsic_duration) : Asset (directory, file_name) , _progress (progress) , _fps (fps) , _entry_point (0) - , _length (length) + , _intrinsic_duration (intrinsic_duration) { } @@ -84,8 +84,8 @@ MXFAsset::equals (shared_ptr<const Asset> other, EqualityOptions, list<string>& return false; } - if (_length != other_mxf->_length) { - notes.push_back ("MXF lengths differ"); + if (_intrinsic_duration != other_mxf->_intrinsic_duration) { + notes.push_back ("MXF intrinsic durations differ"); return false; } @@ -93,7 +93,7 @@ MXFAsset::equals (shared_ptr<const Asset> other, EqualityOptions, list<string>& } int -MXFAsset::length () const +MXFAsset::intrinsic_duration () const { - return _length; + return _intrinsic_duration; } |