*/
+
#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(""))
Cinema::read_screens (cxml::ConstNodePtr node)
{
for (auto i: node->node_children("Screen")) {
- add_screen (shared_ptr<Screen>(new Screen(i)));
+ add_screen (make_shared<Screen>(i));
}
}
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