/*
- 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.
*/
+
#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(""))
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));
}
}
void
Cinema::as_xml (xmlpp::Element* parent) const
{
- parent->add_child("Name")->add_child_text (name);
+ cxml::add_text_child(parent, "Name", name);
for (auto i: emails) {
- parent->add_child("Email")->add_child_text (i);
+ cxml::add_text_child(parent, "Email", i);
}
- parent->add_child("Notes")->add_child_text (notes);
+ cxml::add_text_child(parent, "Notes", 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));
+ cxml::add_text_child(parent, "UTCOffsetHour", raw_convert<string> (_utc_offset_hour));
+ cxml::add_text_child(parent, "UTCOffsetMinute", raw_convert<string> (_utc_offset_minute));
for (auto i: _screens) {
- i->as_xml (parent->add_child ("Screen"));
+ i->as_xml(cxml::add_child(parent, "Screen"));
}
}
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