Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 25e44f77dcd698758b2853a355c70356d07288ea..5ec00f9c152ed7e04f56fe000f0dcfae4ef2b211 100644 (file)
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -1,104 +1,103 @@
 /*
-    Copyright (C) 2012 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 <boost/algorithm/string.hpp>
 #include "screen.h"
-#include "format.h"
-#include "exceptions.h"
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::vector;
 
-Screen::Screen (string n)
-       : _name (n)
+Screen::Screen (cxml::ConstNodePtr node)
+       : name (node->string_child("Name"))
+       , notes (node->optional_string_child("Notes").get_value_or (""))
 {
-       vector<Format const *> f = Format::all ();
-       for (vector<Format const *>::iterator i = f.begin(); i != f.end(); ++i) {
-               set_geometry (*i, Position (0, 0), Size (2048, 1080));
+       if (node->optional_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")) {
+               if (boost::algorithm::starts_with(i->content(), "-----BEGIN CERTIFICATE-----")) {
+                       trusted_devices.push_back (TrustedDevice(dcp::Certificate(i->content())));
+               } else {
+                       trusted_devices.push_back (TrustedDevice(i->content()));
+               }
        }
 }
 
 void
-Screen::set_geometry (Format const * f, Position p, Size s)
+Screen::as_xml (xmlpp::Element* parent) const
 {
-       _geometries[f] = Geometry (p, s);
+       parent->add_child("Name")->add_child_text (name);
+       if (recipient) {
+               parent->add_child("Recipient")->add_child_text (recipient->certificate (true));
+       }
+
+       parent->add_child("Notes")->add_child_text (notes);
+
+       BOOST_FOREACH (TrustedDevice i, trusted_devices) {
+               parent->add_child("TrustedDevice")->add_child_text(i.as_string());
+       }
 }
 
-Position
-Screen::position (Format const * f) const
+vector<string>
+Screen::trusted_device_thumbprints () const
 {
-       GeometryMap::const_iterator i = _geometries.find (f);
-       if (i == _geometries.end ()) {
-               throw PlayError ("format not found for screen");
+       vector<string> t;
+       BOOST_FOREACH (TrustedDevice i, trusted_devices) {
+               t.push_back (i.thumbprint());
        }
-
-       return i->second.position;
+       return t;
 }
 
-Size
-Screen::size (Format const * f) const
+TrustedDevice::TrustedDevice (string thumbprint)
+       : _thumbprint (thumbprint)
 {
-       GeometryMap::const_iterator i = _geometries.find (f);
-       if (i == _geometries.end ()) {
-               throw PlayError ("format not found for screen");
-       }
 
-       return i->second.size;
 }
 
-string
-Screen::as_metadata () const
+TrustedDevice::TrustedDevice (dcp::Certificate certificate)
+       : _certificate (certificate)
 {
-       stringstream s;
-       s << "\"" << _name << "\"";
 
-       for (GeometryMap::const_iterator i = _geometries.begin(); i != _geometries.end(); ++i) {
-               s << " " << i->first->as_metadata()
-                 << " " << i->second.position.x << " " << i->second.position.y
-                 << " " << i->second.size.width << " " << i->second.size.height;
-       }
-
-       return s.str ();
 }
 
-shared_ptr<Screen>
-Screen::create_from_metadata (string v)
+string
+TrustedDevice::as_string () const
 {
-       vector<string> b = split_at_spaces_considering_quotes (v);
-
-       if (b.size() < 1) {
-               return shared_ptr<Screen> ();
+       if (_certificate) {
+               return _certificate->certificate(true);
        }
 
-       shared_ptr<Screen> s (new Screen (b[0]));
+       return *_thumbprint;
+}
 
-       vector<string>::size_type i = 1;
-       while (b.size() > i) {
-               if (b.size() >= (i + 5)) {
-                       s->set_geometry (
-                               Format::from_metadata (b[i].c_str()),
-                               Position (atoi (b[i+1].c_str()), atoi (b[i+2].c_str())),
-                               Size (atoi (b[i+3].c_str()), atoi (b[i+4].c_str()))
-                               );
-               }
-               i += 5;
+string
+TrustedDevice::thumbprint () const
+{
+       if (_certificate) {
+               return _certificate->thumbprint ();
        }
 
-       return s;
+       return *_thumbprint;
 }