Various work on certificate handling for screens; need XML config here, now.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 848e466a6d1f86d0c0c1f91ed34a0353a258b576..a74c36f73c66e1c0d42ab25e88ae0d6ced9c0cd0 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -50,6 +50,7 @@ Config::Config ()
        string line;
 
        shared_ptr<Cinema> cinema;
+       shared_ptr<Screen> screen;
        
        while (getline (f, line)) {
                if (line.empty ()) {
@@ -99,8 +100,15 @@ Config::Config ()
                        assert (cinema);
                        cinema->email = v;
                } else if (k == "screen") {
-                       shared_ptr<Screen> s (new Screen (v));
-                       cinema->screens.push_back (s);
+                       assert (cinema);
+                       if (screen) {
+                               cinema->screens.push_back (screen);
+                       }
+                       screen.reset (new Screen (v, shared_ptr<libdcp::Certificate> ()));
+               } else if (k == "screen_certificate") {
+                       assert (screen);
+                       shared_ptr<Certificate> c (new libdcp::Certificate);
+                       c->set_from_string (v);
                }
        }