Various fixes to push audio vaguely in the right direction.

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

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 347e1d655a76aae7fc954bb4d7b69e7ec344b488..fe8369cb885bf1291106f80d91563503037e641e 100644 (file)
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -1,30 +1,39 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "screen.h"
 #include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
 
 Screen::Screen (cxml::ConstNodePtr node)
-       : name (node->string_child ("Name"))
+       : name (node->string_child("Name"))
+       , notes (node->optional_string_child("Notes").get_value_or (""))
 {
        if (node->optional_string_child ("Certificate")) {
-               certificate = dcp::Certificate (node->string_child ("Certificate"));
+               recipient = dcp::Certificate (node->string_child ("Certificate"));
+       } else if (node->optional_string_child ("Recipient")) {
+               recipient = dcp::Certificate (node->string_child ("Recipient"));
+       }
+
+       BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children ("TrustedDevice")) {
+               trusted_devices.push_back (dcp::Certificate (i->content ()));
        }
 }
 
@@ -32,7 +41,13 @@ void
 Screen::as_xml (xmlpp::Element* parent) const
 {
        parent->add_child("Name")->add_child_text (name);
-       if (certificate) {
-               parent->add_child("Certificate")->add_child_text (certificate->certificate (true));
+       if (recipient) {
+               parent->add_child("Recipient")->add_child_text (recipient->certificate (true));
+       }
+
+       parent->add_child("Notes")->add_child_text (notes);
+
+       BOOST_FOREACH (dcp::Certificate const & i, trusted_devices) {
+               parent->add_child("TrustedDevice")->add_child_text (i.certificate (true));
        }
 }