Add a somewhat dubious constructor.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 50426cc1b617b918470cb6ddcbad48e0cfe8c72d..d8703dd02e5eb62da8fb4c45bb8d6e2395bf186d 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <libxml++/nodes/element.h>
 #include "reel.h"
 #include "util.h"
 #include "picture_asset.h"
@@ -27,57 +28,55 @@ using namespace std;
 using namespace libdcp;
 
 void
-Reel::write_to_cpl (ostream& s) const
+Reel::write_to_cpl (xmlpp::Node* parent) const
 {
-       s << "    <Reel>\n"
-         << "      <Id>urn:uuid:" << make_uuid() << "</Id>\n"
-         << "      <AssetList>\n";
-       
+       xmlpp::Element* reel = parent->add_child("Reel");
+       reel->add_child("Id")->add_child_text("urn:uuid:" + make_uuid());
+       xmlpp::Element* asset_list = reel->add_child("AssetList");
+
        if (_main_picture) {
-               _main_picture->write_to_cpl (s);
+               _main_picture->write_to_cpl (asset_list);
        }
 
        if (_main_sound) {
-               _main_sound->write_to_cpl (s);
+               _main_sound->write_to_cpl (asset_list);
        }
 
        if (_main_subtitle) {
-               _main_subtitle->write_to_cpl (s);
+               _main_subtitle->write_to_cpl (asset_list);
        }
 }
        
-list<string>
-Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt) const
+bool
+Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, list<string>& notes) const
 {
-       list<string> o;
-       
        if ((_main_picture && !other->_main_picture) || (!_main_picture && other->_main_picture)) {
-               o.push_back ("reel has different assets");
+               notes.push_back ("reel has different assets");
+               return false;
        }
        
-       if (_main_picture) {
-               list<string> m = _main_picture->equals (other->_main_picture, opt);
-               o.merge (m);
+       if (_main_picture && !_main_picture->equals (other->_main_picture, opt, notes)) {
+               return false;
        }
 
        if ((_main_sound && !other->_main_sound) || (!_main_sound && other->_main_sound)) {
-               o.push_back ("reel has different assets");
+               notes.push_back ("reel has different assets");
+               return false;
        }
        
-       if (_main_sound) {
-               list<string> m = _main_sound->equals (other->_main_sound, opt);
-               o.merge (m);
+       if (_main_sound && !_main_sound->equals (other->_main_sound, opt, notes)) {
+               return false;
        }
 
        if ((_main_subtitle && !other->_main_subtitle) || (!_main_subtitle && other->_main_subtitle)) {
-               o.push_back ("reel has different assets");
+               notes.push_back ("reel has different assets");
+               return false;
        }
        
-       if (_main_subtitle) {
-               list<string> m = _main_subtitle->equals (other->_main_subtitle, opt);
-               o.merge (m);
+       if (_main_subtitle && !_main_subtitle->equals (other->_main_subtitle, opt, notes)) {
+               return false;
        }
 
-       return o;
+       return true;
 }