X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema.cc;h=1902f15f9f4f091433f3fc10e12c8f4b5a301381;hb=f41818f14369f170475b7f2bde1a2dd856517b14;hp=3f1750621cea6166b1144b23fc754ce4972fbaf3;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc index 3f1750621..1902f15f9 100644 --- a/src/lib/cinema.cc +++ b/src/lib/cinema.cc @@ -25,13 +25,13 @@ #include #include #include -#include #include using std::list; using std::string; using boost::shared_ptr; -using boost::make_shared; +using dcp::raw_convert; +using dcpomatic::Screen; Cinema::Cinema (cxml::ConstNodePtr node) : name (node->string_child ("Name")) @@ -58,7 +58,7 @@ Cinema::read_screens (cxml::ConstNodePtr node) { list s = node->node_children ("Screen"); for (list::iterator i = s.begin(); i != s.end(); ++i) { - add_screen (make_shared (*i)); + add_screen (shared_ptr (new Screen (*i))); } } @@ -73,8 +73,8 @@ Cinema::as_xml (xmlpp::Element* parent) const parent->add_child("Notes")->add_child_text (notes); - parent->add_child("UTCOffsetHour")->add_child_text (dcp::raw_convert (_utc_offset_hour)); - parent->add_child("UTCOffsetMinute")->add_child_text (dcp::raw_convert (_utc_offset_minute)); + parent->add_child("UTCOffsetHour")->add_child_text (raw_convert (_utc_offset_hour)); + parent->add_child("UTCOffsetMinute")->add_child_text (raw_convert (_utc_offset_minute)); BOOST_FOREACH (shared_ptr i, _screens) { i->as_xml (parent->add_child ("Screen"));