Various attempts to clean up DCP comparison code.

[libdcp.git] / src / dcp.cc

diff --git a/src/dcp.cc b/src/dcp.cc
index dc0ffeaa3e3c146e856e0d7b772771869e682e74..ca1c23d9a9df0fdaf7e85a75769c380781f4cf05 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -21,6 +21,7 @@
  *  @brief DCP class.
  */
 
+#include "raw_convert.h"
 #include "dcp.h"
 #include "sound_mxf.h"
 #include "picture_mxf.h"
@@ -42,7 +43,6 @@
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
 #include <sstream>
 #include <iomanip>
 #include <cassert>
@@ -50,6 +50,7 @@
 
 using std::string;
 using std::list;
+using std::cout;
 using std::stringstream;
 using std::ostream;
 using std::make_pair;
@@ -57,19 +58,21 @@ using std::map;
 using std::cout;
 using std::exception;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::algorithm::starts_with;
 using namespace dcp;
 
 DCP::DCP (boost::filesystem::path directory)
        : _directory (directory)
 {
-       boost::filesystem::create_directories (directory);
+       if (!boost::filesystem::exists (directory)) {
+               boost::filesystem::create_directories (directory);
+       }
+       
        _directory = boost::filesystem::canonical (_directory);
 }
 
 template<class T> void
-survivable_error (bool keep_going, list<shared_ptr<DCPReadError> >* errors, T const & e)
+survivable_error (bool keep_going, dcp::DCP::ReadErrors* errors, T const & e)
 {
        if (keep_going) {
                if (errors) {
@@ -81,7 +84,7 @@ survivable_error (bool keep_going, list<shared_ptr<DCPReadError> >* errors, T co
 }
 
 void
-DCP::read (bool keep_going, list<shared_ptr<DCPReadError> >* errors)
+DCP::read (bool keep_going, ReadErrors* errors)
 {
        /* Read the ASSETMAP */
        
@@ -133,7 +136,7 @@ DCP::read (bool keep_going, list<shared_ptr<DCPReadError> >* errors)
                        if (root == "CompositionPlaylist") {
                                _assets.push_back (shared_ptr<CPL> (new CPL (path)));
                        } else if (root == "DCSubtitle") {
-                               _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path)));
+                               _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path, false)));
                        }
                } else if (boost::algorithm::ends_with (path.string(), ".mxf")) {
                        ASDCP::EssenceType_t type;
@@ -154,6 +157,9 @@ DCP::read (bool keep_going, list<shared_ptr<DCPReadError> >* errors)
                                case ASDCP::ESS_JPEG_2000_S:
                                        _assets.push_back (shared_ptr<StereoPictureMXF> (new StereoPictureMXF (path)));
                                        break;
+                               case ASDCP::ESS_TIMED_TEXT:
+                                       _assets.push_back (shared_ptr<SubtitleContent> (new SubtitleContent (path, true)));
+                                       break;
                                default:
                                        throw DCPReadError ("Unknown MXF essence type");
                                }
@@ -169,23 +175,28 @@ DCP::read (bool keep_going, list<shared_ptr<DCPReadError> >* errors)
 bool
 DCP::equals (DCP const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 {
-       if (_assets.size() != other._assets.size()) {
-               note (ERROR, String::compose ("Asset counts differ: %1 vs %2", _assets.size(), other._assets.size()));
+       list<shared_ptr<CPL> > a = cpls ();
+       list<shared_ptr<CPL> > b = other.cpls ();
+       
+       if (a.size() != b.size()) {
+               note (DCP_ERROR, String::compose ("CPL counts differ: %1 vs %2", a.size(), b.size()));
                return false;
        }
 
-       list<shared_ptr<Asset> >::const_iterator a = _assets.begin ();
-       list<shared_ptr<Asset> >::const_iterator b = other._assets.begin ();
+       bool r = true;
 
-       while (a != _assets.end ()) {
-               if (!(*a)->equals (*b, opt, note)) {
-                       return false;
+       for (list<shared_ptr<CPL> >::const_iterator i = a.begin(); i != a.end(); ++i) {
+               list<shared_ptr<CPL> >::const_iterator j = b.begin ();
+               while (j != b.end() && !(*j)->equals (*i, opt, note)) {
+                       ++j;
+               }
+
+               if (j == b.end ()) {
+                       r = false;
                }
-               ++a;
-               ++b;
        }
 
-       return true;
+       return r;
 }
 
 void
@@ -194,14 +205,6 @@ DCP::add (boost::shared_ptr<Asset> asset)
        _assets.push_back (asset);
 }
 
-class AssetComparator
-{
-public:
-       bool operator() (shared_ptr<const Content> a, shared_ptr<const Content> b) {
-               return a->id() < b->id();
-       }
-};
-
 bool
 DCP::encrypted () const
 {
@@ -369,7 +372,7 @@ DCP::write_assetmap (Standard standard, string pkl_uuid, int pkl_length, XMLMeta
        chunk->add_child("Path")->add_child_text (pkl_uuid + "_pkl.xml");
        chunk->add_child("VolumeIndex")->add_child_text ("1");
        chunk->add_child("Offset")->add_child_text ("0");
-       chunk->add_child("Length")->add_child_text (lexical_cast<string> (pkl_length));
+       chunk->add_child("Length")->add_child_text (raw_convert<string> (pkl_length));
        
        for (list<shared_ptr<Asset> >::const_iterator i = _assets.begin(); i != _assets.end(); ++i) {
                (*i)->write_to_assetmap (asset_list, _directory);