Various KDM and encryption fixes.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 7d945c897..a72e1a9e4 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -32,6 +32,7 @@
 #include "dcp_content_type.h"
 #include "sound_processor.h"
 #include "colour_conversion.h"
+#include "cinema.h"
 
 #include "i18n.h"
 
@@ -128,6 +129,11 @@ Config::read ()
 	for (list<shared_ptr<cxml::Node> >::iterator i = cc.begin(); i != cc.end(); ++i) {
 		_colour_conversions.push_back (PresetColourConversion (*i));
 	}
+
+	list<shared_ptr<cxml::Node> > cin = f.node_children ("Cinema");
+	for (list<shared_ptr<cxml::Node> >::iterator i = cin.begin(); i != cin.end(); ++i) {
+		_cinemas.push_back (shared_ptr<Cinema> (new Cinema (*i)));
+	}
 }
 
 void
@@ -280,6 +286,10 @@ Config::write () const
 		i->as_xml (root->add_child ("ColourConversion"));
 	}
 
+	for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
+		(*i)->as_xml (root->add_child ("Cinema"));
+	}
+
 	doc.write_to_file_formatted (file(false).string ());
 }