Use plain git hash for VERSION when there is no exact tag.

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

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 6e651dc764d467d64f98424cb1ff5cb19301ffed..3b4b9d7b615aa1a7116f4acb221abd3658fe41da 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -1,40 +1,44 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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 "cinema.h"
 #include "screen.h"
 #include "dcpomatic_assert.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
-#include <iostream>
 
-using std::list;
+
+using std::make_shared;
+using std::shared_ptr;
 using std::string;
-using boost::shared_ptr;
+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(""))
 {
-       BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Email")) {
+       for (auto i: node->node_children("Email")) {
                emails.push_back (i->content ());
        }
 
@@ -53,9 +57,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));
        }
 }
 
@@ -64,16 +67,16 @@ Cinema::as_xml (xmlpp::Element* parent) const
 {
        parent->add_child("Name")->add_child_text (name);
 
-       BOOST_FOREACH (string i, emails) {
+       for (auto i: emails) {
                parent->add_child("Email")->add_child_text (i);
        }
 
        parent->add_child("Notes")->add_child_text (notes);
 
-       parent->add_child("UTCOffsetHour")->add_child_text (dcp::raw_convert<string> (_utc_offset_hour));
-       parent->add_child("UTCOffsetMinute")->add_child_text (dcp::raw_convert<string> (_utc_offset_minute));
+       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));
 
-       BOOST_FOREACH (shared_ptr<Screen> i, _screens) {
+       for (auto i: _screens) {
                i->as_xml (parent->add_child ("Screen"));
        }
 }
@@ -88,7 +91,10 @@ Cinema::add_screen (shared_ptr<Screen> s)
 void
 Cinema::remove_screen (shared_ptr<Screen> s)
 {
-       _screens.remove (s);
+       auto iter = std::find(_screens.begin(), _screens.end(), s);
+       if (iter != _screens.end()) {
+               _screens.erase(iter);
+       }
 }
 
 void