Remove unnecessary using statements.

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

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 42557efc3135c4614fdb1dfbec294b61c71941b4..7388dbc2fb890390a15ca75f9f5beead2f956a20 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,22 @@
 
 */
 
+
 #include "cinema.h"
 #include "screen.h"
 #include "dcpomatic_assert.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
-#include <iostream>
 
-using std::list;
-using std::string;
+
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
 using dcp::raw_convert;
 using dcpomatic::Screen;
 
+
 Cinema::Cinema (cxml::ConstNodePtr node)
        : name (node->string_child ("Name"))
        , notes (node->optional_string_child("Notes").get_value_or(""))
@@ -39,14 +41,6 @@ Cinema::Cinema (cxml::ConstNodePtr node)
        for (auto i: node->node_children("Email")) {
                emails.push_back (i->content ());
        }
-
-       if (node->optional_number_child<int>("UTCOffset")) {
-               _utc_offset_hour = node->number_child<int>("UTCOffset");
-       } else {
-               _utc_offset_hour = node->optional_number_child<int>("UTCOffsetHour").get_value_or (0);
-       }
-
-       _utc_offset_minute = node->optional_number_child<int>("UTCOffsetMinute").get_value_or (0);
 }
 
 /* This is necessary so that we can use shared_from_this in add_screen (which cannot be done from
@@ -55,9 +49,8 @@ Cinema::Cinema (cxml::ConstNodePtr node)
 void
 Cinema::read_screens (cxml::ConstNodePtr node)
 {
-       list<cxml::NodePtr> s = node->node_children ("Screen");
-       for (list<cxml::NodePtr>::iterator i = s.begin(); i != s.end(); ++i) {
-               add_screen (shared_ptr<Screen> (new Screen (*i)));
+       for (auto i: node->node_children("Screen")) {
+               add_screen (make_shared<Screen>(i));
        }
 }
 
@@ -72,9 +65,6 @@ Cinema::as_xml (xmlpp::Element* parent) const
 
        parent->add_child("Notes")->add_child_text (notes);
 
-       parent->add_child("UTCOffsetHour")->add_child_text (raw_convert<string> (_utc_offset_hour));
-       parent->add_child("UTCOffsetMinute")->add_child_text (raw_convert<string> (_utc_offset_minute));
-
        for (auto i: _screens) {
                i->as_xml (parent->add_child ("Screen"));
        }
@@ -90,19 +80,9 @@ Cinema::add_screen (shared_ptr<Screen> s)
 void
 Cinema::remove_screen (shared_ptr<Screen> s)
 {
-       _screens.remove (s);
-}
-
-void
-Cinema::set_utc_offset_hour (int h)
-{
-       DCPOMATIC_ASSERT (h >= -11 && h <= 12);
-       _utc_offset_hour = h;
+       auto iter = std::find(_screens.begin(), _screens.end(), s);
+       if (iter != _screens.end()) {
+               _screens.erase(iter);
+       }
 }
 
-void
-Cinema::set_utc_offset_minute (int m)
-{
-       DCPOMATIC_ASSERT (m >= 0 && m <= 59);
-       _utc_offset_minute = m;
-}