diff options
Diffstat (limited to 'src/content.cc')
| -rw-r--r-- | src/content.cc | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/content.cc b/src/content.cc index 995fd920..8a654670 100644 --- a/src/content.cc +++ b/src/content.cc @@ -33,19 +33,8 @@ using namespace dcp; Content::Content (boost::filesystem::path file) : Asset (file) - , _edit_rate (24, 1) - , _intrinsic_duration (0) { - /* Note: the _edit_rate and _intrinsic_duration above are just defaults, - the derived class must set these up according to `file'. - */ -} - -Content::Content (Fraction edit_rate) - : _edit_rate (edit_rate) - , _intrinsic_duration (0) -{ - + } bool @@ -54,16 +43,6 @@ Content::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::fu if (!Asset::equals (other, opt, note)) { return false; } - - if (_edit_rate != other->_edit_rate) { - note (DCP_ERROR, "content edit rates differ"); - return false; - } - - if (_intrinsic_duration != other->_intrinsic_duration) { - note (DCP_ERROR, "asset intrinsic durations differ"); - return false; - } return true; } |