projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
lib
/
cinema.cc
diff --git
a/src/lib/cinema.cc
b/src/lib/cinema.cc
index 43a4322396144417041ec801c380895f170079bf..c8cb7b66cc935be866e8049b3a489971fd2712bc 100644
(file)
--- a/
src/lib/cinema.cc
+++ b/
src/lib/cinema.cc
@@
-24,7
+24,7
@@
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
-Cinema::Cinema (
shared_ptr<const cxml::Node>
node)
+Cinema::Cinema (
cxml::ConstNodePtr
node)
: name (node->string_child ("Name"))
, email (node->string_child ("Email"))
{
: name (node->string_child ("Name"))
, email (node->string_child ("Email"))
{
@@
-35,7
+35,7
@@
Cinema::Cinema (shared_ptr<const cxml::Node> node)
a constructor)
*/
void
a constructor)
*/
void
-Cinema::read_screens (
shared_ptr<const cxml::Node>
node)
+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) {
{
list<cxml::NodePtr> s = node->node_children ("Screen");
for (list<cxml::NodePtr>::iterator i = s.begin(); i != s.end(); ++i) {
@@
-67,7
+67,7
@@
Cinema::remove_screen (shared_ptr<Screen> s)
_screens.remove (s);
}
_screens.remove (s);
}
-Screen::Screen (
shared_ptr<const cxml::Node>
node)
+Screen::Screen (
cxml::ConstNodePtr
node)
{
name = node->string_child ("Name");
certificate = shared_ptr<dcp::Certificate> (new dcp::Certificate (node->string_child ("Certificate")));
{
name = node->string_child ("Name");
certificate = shared_ptr<dcp::Certificate> (new dcp::Certificate (node->string_child ("Certificate")));