projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: using sorting.
[dcpomatic.git]
/
src
/
lib
/
cinema.cc
diff --git
a/src/lib/cinema.cc
b/src/lib/cinema.cc
index 5e2b1b533bb49df0926844c15366fec3ff88e063..57780fa7b859cd456f47052fd9b5d9d9ac065175 100644
(file)
--- a/
src/lib/cinema.cc
+++ b/
src/lib/cinema.cc
@@
-1,42
+1,54
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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.
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
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 "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 std::string;
-using boost::shared_ptr;
+using dcp::raw_convert;
+using dcpomatic::Screen;
+
Cinema::Cinema (cxml::ConstNodePtr node)
: name (node->string_child ("Name"))
Cinema::Cinema (cxml::ConstNodePtr node)
: name (node->string_child ("Name"))
- ,
_utc_offset (node->optional_number_child<int>("UTCOffset").get_value_or (0
))
+ ,
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 ());
}
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
}
/* This is necessary so that we can use shared_from_this in add_screen (which cannot be done from
@@
-45,9
+57,8
@@
Cinema::Cinema (cxml::ConstNodePtr node)
void
Cinema::read_screens (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));
}
}
}
}
@@
-56,13
+67,16
@@
Cinema::as_xml (xmlpp::Element* parent) const
{
parent->add_child("Name")->add_child_text (name);
{
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("Email")->add_child_text (i);
}
- parent->add_child("UTCOffset")->add_child_text (dcp::raw_convert<string> (_utc_offset));
+ 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));
-
BOOST_FOREACH (shared_ptr<Screen> i,
_screens) {
+
for (auto i:
_screens) {
i->as_xml (parent->add_child ("Screen"));
}
}
i->as_xml (parent->add_child ("Screen"));
}
}
@@
-81,8
+95,15
@@
Cinema::remove_screen (shared_ptr<Screen> s)
}
void
}
void
-Cinema::set_utc_offset (int o)
+Cinema::set_utc_offset_hour (int h)
+{
+ DCPOMATIC_ASSERT (h >= -11 && h <= 12);
+ _utc_offset_hour = h;
+}
+
+void
+Cinema::set_utc_offset_minute (int m)
{
{
- DCPOMATIC_ASSERT (
o >= -11 && o <= 12
);
- _utc_offset
= o
;
+ DCPOMATIC_ASSERT (
m >= 0 && m <= 59
);
+ _utc_offset
_minute = m
;
}
}