Fix truncated log timestamps in at least some cases.

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

diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index 25e44f77dcd698758b2853a355c70356d07288ea..159c4326bc5b08e7e4ad26af87cffd7f54391efe 100644 (file)
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,88 +17,33 @@
 
 */
 
-#include <boost/algorithm/string.hpp>
 #include "screen.h"
-#include "format.h"
-#include "exceptions.h"
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
 
-using namespace std;
-using namespace boost;
-
-Screen::Screen (string n)
-       : _name (n)
+Screen::Screen (cxml::ConstNodePtr node)
+       : name (node->string_child ("Name"))
 {
-       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"));
        }
-}
-
-void
-Screen::set_geometry (Format const * f, Position p, Size s)
-{
-       _geometries[f] = Geometry (p, s);
-}
 
-Position
-Screen::position (Format const * f) const
-{
-       GeometryMap::const_iterator i = _geometries.find (f);
-       if (i == _geometries.end ()) {
-               throw PlayError ("format not found for screen");
+       BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children ("TrustedDevice")) {
+               trusted_devices.push_back (dcp::Certificate (i->content ()));
        }
-
-       return i->second.position;
 }
 
-Size
-Screen::size (Format const * f) const
-{
-       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
-{
-       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)
+void
+Screen::as_xml (xmlpp::Element* parent) const
 {
-       vector<string> b = split_at_spaces_considering_quotes (v);
-
-       if (b.size() < 1) {
-               return shared_ptr<Screen> ();
+       parent->add_child("Name")->add_child_text (name);
+       if (recipient) {
+               parent->add_child("Recipient")->add_child_text (recipient->certificate (true));
        }
 
-       shared_ptr<Screen> s (new Screen (b[0]));
-
-       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;
+       BOOST_FOREACH (dcp::Certificate const & i, trusted_devices) {
+               parent->add_child("TrustedDevice")->add_child_text (i.certificate (true));
        }
-
-       return s;
 }