projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename a variable.
[dcpomatic.git]
/
src
/
lib
/
cinema.h
diff --git
a/src/lib/cinema.h
b/src/lib/cinema.h
index 3cb17502bed46eed17d1b118ef68b81328962540..86245953b85b830d4031b3c5bbec0025a598ef2e 100644
(file)
--- a/
src/lib/cinema.h
+++ b/
src/lib/cinema.h
@@
-29,7
+29,9
@@
namespace xmlpp {
class Element;
}
class Element;
}
-class Screen;
+namespace dcpomatic {
+ class Screen;
+}
/** @class Cinema
* @brief A description of a Cinema for KDM generation.
/** @class Cinema
* @brief A description of a Cinema for KDM generation.
@@
-48,14
+50,14
@@
public:
, _utc_offset_minute (utc_offset_minute)
{}
, _utc_offset_minute (utc_offset_minute)
{}
- Cinema (cxml::ConstNodePtr);
+
explicit
Cinema (cxml::ConstNodePtr);
void read_screens (cxml::ConstNodePtr);
void as_xml (xmlpp::Element *) const;
void read_screens (cxml::ConstNodePtr);
void as_xml (xmlpp::Element *) const;
- void add_screen (boost::shared_ptr<Screen>);
- void remove_screen (boost::shared_ptr<Screen>);
+ void add_screen (boost::shared_ptr<
dcpomatic::
Screen>);
+ void remove_screen (boost::shared_ptr<
dcpomatic::
Screen>);
void set_utc_offset_hour (int h);
void set_utc_offset_minute (int m);
void set_utc_offset_hour (int h);
void set_utc_offset_minute (int m);
@@
-72,12
+74,12
@@
public:
return _utc_offset_minute;
}
return _utc_offset_minute;
}
- std::list<boost::shared_ptr<Screen> > screens () const {
+ std::list<boost::shared_ptr<
dcpomatic::
Screen> > screens () const {
return _screens;
}
private:
return _screens;
}
private:
- std::list<boost::shared_ptr<Screen> > _screens;
+ std::list<boost::shared_ptr<
dcpomatic::
Screen> > _screens;
/** Offset such that the equivalent time in UTC can be determined
by subtracting the offset from the local time.
*/
/** Offset such that the equivalent time in UTC can be determined
by subtracting the offset from the local time.
*/