X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema.cc;h=11bc888da32127ef4a6e2cd917026496aaa206d9;hp=62023618676a6f83de20bfde5f6be6acd651e1b7;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=cc27c2716f755305d67f1e1ba828ecf37f8405dd

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 620236186..11bc888da 100644
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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,9 +17,10 @@
 
 */
 
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
 #include "cinema.h"
+#include "screen.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 using std::list;
 using boost::shared_ptr;
@@ -66,22 +67,3 @@ Cinema::remove_screen (shared_ptr<Screen> s)
 {
 	_screens.remove (s);
 }
-
-Screen::Screen (cxml::ConstNodePtr node)
-{
-	name = node->string_child ("Name");
-	if (node->optional_string_child ("Certificate")) {
-		certificate = dcp::Certificate (node->string_child ("Certificate"));
-	}
-}
-
-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));
-	}
-}
-
-