Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

[libdcp.git] / src / content.cc

diff --git a/src/content.cc b/src/content.cc
index 50db005aaa3a55a8b0e1da5ed76769a33f75ea45..8a654670b69f2c7d15c4597622b89e57d034a1eb 100644 (file)
--- a/src/content.cc
+++ b/src/content.cc
@@ -27,26 +27,14 @@
 #include <boost/function.hpp>
 #include <iostream>
 
-/* We need this here for the #undef ERROR for Windows */
-#include "types.h"
-
 using namespace std;
 using namespace boost;
 using namespace dcp;
 
 Content::Content (boost::filesystem::path file)
        : Asset (file)
-       , _edit_rate (24, 1)
-       , _intrinsic_duration (0)
-{
-
-}
-
-Content::Content (Fraction edit_rate)
-       : _edit_rate (edit_rate)
-       , _intrinsic_duration (0)
 {
-
+       
 }
 
 bool
@@ -55,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 (ERROR, "content edit rates differ");
-               return false;
-       }
-       
-       if (_intrinsic_duration != other->_intrinsic_duration) {
-               note (ERROR, "asset intrinsic durations differ");
-               return false;
-       }
 
        return true;
 }