projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
cinema.h
diff --git
a/src/lib/cinema.h
b/src/lib/cinema.h
index 74357f65d687e0261ded537e94b3b4f95afcfdb2..8421f468751f72548560c9705f27cefa9bb8fcaa 100644
(file)
--- a/
src/lib/cinema.h
+++ b/
src/lib/cinema.h
@@
-36,7
+36,7
@@
class Cinema;
class Screen
{
public:
class Screen
{
public:
- Screen (std::string const & n, boost::
shared_ptr
<dcp::Certificate> cert)
+ Screen (std::string const & n, boost::
optional
<dcp::Certificate> cert)
: name (n)
, certificate (cert)
{}
: name (n)
, certificate (cert)
{}
@@
-47,7
+47,7
@@
public:
boost::shared_ptr<Cinema> cinema;
std::string name;
boost::shared_ptr<Cinema> cinema;
std::string name;
- boost::
shared_ptr
<dcp::Certificate> certificate;
+ boost::
optional
<dcp::Certificate> certificate;
};
/** @class Cinema
};
/** @class Cinema