Merge pull request #18 from wruppelx/master

[asdcplib.git] / src / TimedText_Parser.cpp

diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp
index b6b2cc7c52897322b2a52760cbd91ef505ac99ae..6b6d0066be16cfacd7cd3a8b904f42fd5b7d0005 100644 (file)
--- a/src/TimedText_Parser.cpp
+++ b/src/TimedText_Parser.cpp
@@ -151,7 +151,12 @@ get_UUID_from_element(XMLElement* Element, UUID& ID)
 {
   assert(Element);
   const char* p = Element->GetBody().c_str();
-  if ( strncmp(p, "urn:uuid:", 9) == 0 )    p += 9;
+
+  if ( strncmp(p, "urn:uuid:", 9) == 0 )
+    {
+      p += 9;
+    }
+  
   return ID.DecodeHex(p);
 }
 
@@ -159,9 +164,15 @@ get_UUID_from_element(XMLElement* Element, UUID& ID)
 bool
 get_UUID_from_child_element(const char* name, XMLElement* Parent, UUID& outID)
 {
-  assert(name); assert(Parent);
+  assert(name);
+  assert(Parent);
   XMLElement* Child = Parent->GetChildWithName(name);
-  if ( Child == 0 )    return false;
+
+  if ( Child == 0 )
+    {
+      return false;
+    }
+
   return get_UUID_from_element(Child, outID);
 }
 
@@ -200,7 +211,7 @@ ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead(const std::strin
 Result_t
 ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead()
 {
-  if ( ! m_Root.ParseString(m_XMLDoc.c_str()) )
+  if ( ! m_Root.ParseString(m_XMLDoc) )
     return RESULT_FORMAT;
 
   m_TDesc.EncodingName = "UTF-8"; // the XML parser demands UTF-8
@@ -246,7 +257,13 @@ ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead()
        && m_TDesc.EditRate != EditRate_30
        && m_TDesc.EditRate != EditRate_48
        && m_TDesc.EditRate != EditRate_50
-       && m_TDesc.EditRate != EditRate_60 )
+       && m_TDesc.EditRate != EditRate_60
+       && m_TDesc.EditRate != EditRate_96
+       && m_TDesc.EditRate != EditRate_100
+       && m_TDesc.EditRate != EditRate_120
+       && m_TDesc.EditRate != EditRate_192
+       && m_TDesc.EditRate != EditRate_200
+       && m_TDesc.EditRate != EditRate_240 )
     {
       DefaultLogSink(). Error("Unexpected EditRate: %d/%d\n",
                              m_TDesc.EditRate.Numerator, m_TDesc.EditRate.Denominator);