Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 431af69a2eb3c48367e5a9dbd7c742ff29537100..52a4f0fbd0a1c014c91a51e98d8c70006e5ad91c 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -46,70 +46,36 @@ Reel::write_to_cpl (ostream& s) const
        }
 }
        
-void
-Reel::write_to_pkl (ostream& s) const
-{
-       if (_main_picture) {
-               _main_picture->write_to_pkl (s);
-       }
-
-       if (_main_sound) {
-               _main_sound->write_to_pkl (s);
-       }
-
-       if (_main_subtitle) {
-               _main_subtitle->write_to_pkl (s);
-       }
-}
-
-void
-Reel::write_to_assetmap (ostream& s) const
-{
-       if (_main_picture) {
-               _main_picture->write_to_assetmap (s);
-       }
-
-       if (_main_sound) {
-               _main_sound->write_to_assetmap (s);
-       }
-
-       if (_main_subtitle) {
-               _main_subtitle->write_to_assetmap (s);
-       }
-}
-
-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;
 }