xercesC 3.x support

diff --git a/README b/README
index da0269612ab8b27cd963524f78050228d2d14c70..8dfe2b99c73795cac262413f9bcf35397961e06e 100755 (executable)
--- a/README
+++ b/README
@@ -112,6 +112,13 @@ utilities all respond to -h.
 
 Change History
 
+NEW STUFF:
+ o Changed AudioDescriptor "SampelRate" element name to "EditRate"
+   to make it consistent with the other types. 
+
+o Now builds with XercesC 3.x
+
+
 2010.01.05 -  bug fixes, enhancements, v1.5.32
  o Re-fixed swapped Interop and SMPTE OP Atom UL values. The swap
    introduced in v1.5.31 was done in error.

diff --git a/src/AS_DCP.h b/src/AS_DCP.h
index 9c9165f8b56b8f83e4c39f47d873c33e573e1ddf..a9f8b4430f49f00cb19d9ee62a1f09bee98d9c7b 100755 (executable)
--- a/src/AS_DCP.h
+++ b/src/AS_DCP.h
@@ -246,6 +246,18 @@ namespace ASDCP {
     inline bool operator!=(const Rational& rhs) const {
       return ( rhs.Numerator != Numerator || rhs.Denominator != Denominator );
     }
+
+    inline bool operator<(const Rational& rhs) {
+      if ( Numerator < rhs.Numerator )     return true;
+      if ( Numerator == rhs.Numerator && Denominator < rhs.Denominator )    return true;
+      return false;
+    }
+ 
+    inline bool operator>(const Rational& rhs) {
+      if ( Numerator > rhs.Numerator )     return true;
+      if ( Numerator == rhs.Numerator && Denominator > rhs.Denominator )     return true;
+      return false;
+    }
   };
 
   // common edit rates, use these instead of hard coded constants

diff --git a/src/KM_xml.cpp b/src/KM_xml.cpp
index 6f2092fcd34e8854e861d7d9facf26b52342e739..298a55f528c55cc37814d91bfbc72b48a0dd16dc 100644 (file)
--- a/src/KM_xml.cpp
+++ b/src/KM_xml.cpp
@@ -762,7 +762,13 @@ Kumu::XMLElement::ParseString(const std::string& document)
 
   int errorCount = 0;
   SAXParser* parser = new SAXParser();
-  parser->setDoValidation(true);
+
+// #if XERCES_VERSION_MAJOR < 3
+//   parser->setDoValidation(true);
+// #else
+  parser->setValidationScheme(SAXParser::Val_Always);
+// #endif
+
   parser->setDoNamespaces(true);    // optional
 
   MyTreeHandler* docHandler = new MyTreeHandler(this);

diff --git a/src/Makefile.am b/src/Makefile.am
index 336867e9fbb58a86089056cde4fe8fd78931ab6c..d718fc8eca628032d62cf4a67d65b5b8eaf6497c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,7 +90,7 @@ nodist_libpyasdcp_la_SOURCES = \
        asdcp_python.cpp asdcp_python.h \
        asdcp_python_descriptor.cpp \
        asdcp_python_misc.cpp asdcp_python_writerinfo.h \
-       asdcp_wrappers.h asdcp_python_mxf.cpp
+       asdcp_wrappers.h asdcp_python_mxf.cpp asdcp_python_mxf_text.cpp
 
 # asdcp_python_reader.cpp asdcp_python_writer.cpp