Fix bad frees if exceptions are thrown by constructors.

[libdcp.git] / src / reel.cc

diff --git a/src/reel.cc b/src/reel.cc
index 481b153b93176b6ace07f099d7b203dc367d5ad6..ffb184ab67d0ebca5534822ce260337f0f010e7c 100644 (file)
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -17,32 +17,37 @@
 
 */
 
+#include <libxml++/nodes/element.h>
 #include "reel.h"
 #include "util.h"
 #include "picture_asset.h"
 #include "sound_asset.h"
 #include "subtitle_asset.h"
+#include "kdm.h"
 
-using namespace std;
+using std::string;
+using std::list;
+using std::cout;
+using boost::shared_ptr;
 using namespace libdcp;
 
 void
-Reel::write_to_cpl (xmlpp::Node* node) const
+Reel::write_to_cpl (xmlpp::Element* node, bool interop) const
 {
-       xmlpp::Node* reel = node->add_child ("Reel");
+       xmlpp::Element* reel = node->add_child ("Reel");
        reel->add_child("Id")->add_child_text ("urn:uuid:" + make_uuid());
-       xmlpp::Node* asset_list = reel->add_child ("AssetList");
+       xmlpp::Element* asset_list = reel->add_child ("AssetList");
        
        if (_main_picture) {
-               _main_picture->write_to_cpl (asset_list);
+               _main_picture->write_to_cpl (asset_list, interop);
        }
 
        if (_main_sound) {
-               _main_sound->write_to_cpl (asset_list);
+               _main_sound->write_to_cpl (asset_list, interop);
        }
 
        if (_main_subtitle) {
-               _main_subtitle->write_to_cpl (asset_list);
+               _main_subtitle->write_to_cpl (asset_list, interop);
        }
 }
        
@@ -79,3 +84,23 @@ Reel::equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::f
        return true;
 }
 
+bool
+Reel::encrypted () const
+{
+       return ((_main_picture && _main_picture->encrypted ()) || (_main_sound && _main_sound->encrypted ()));
+}
+
+void
+Reel::add_kdm (KDM const & kdm)
+{
+       list<KDMKey> keys = kdm.keys ();
+       
+       for (list<KDMKey>::iterator i = keys.begin(); i != keys.end(); ++i) {
+               if (i->key_id() == _main_picture->key_id()) {
+                       _main_picture->set_key (i->key ());
+               }
+               if (i->key_id() == _main_sound->key_id()) {
+                       _main_sound->set_key (i->key ());
+               }
+       }
+}