projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix audio analysis after recent breakage.
[dcpomatic.git]
/
src
/
lib
/
cinema.h
diff --git
a/src/lib/cinema.h
b/src/lib/cinema.h
index 2e7660860e66777d015c58246c33758df65e0f91..5c0386837098f1fd668749a57cafeee078ced081 100644
(file)
--- a/
src/lib/cinema.h
+++ b/
src/lib/cinema.h
@@
-21,15
+21,12
@@
* @brief Screen and Cinema classes.
*/
* @brief Screen and Cinema classes.
*/
-#include <
boost/enable_shared_from_this.hpp
>
+#include <
libcxml/cxml.h
>
#include <dcp/certificates.h>
#include <dcp/certificates.h>
+#include <boost/enable_shared_from_this.hpp>
class Cinema;
class Cinema;
-namespace cxml {
- class Node;
-}
-
/** @class Screen
* @brief A representation of a Screen for KDM generation.
*
/** @class Screen
* @brief A representation of a Screen for KDM generation.
*
@@
-39,18
+36,18
@@
namespace cxml {
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)
{}
- Screen (
boost::shared_ptr<const cxml::Node>
);
+ Screen (
cxml::ConstNodePtr
);
void as_xml (xmlpp::Element *) const;
boost::shared_ptr<Cinema> cinema;
std::string name;
void as_xml (xmlpp::Element *) const;
boost::shared_ptr<Cinema> cinema;
std::string name;
- boost::
shared_ptr
<dcp::Certificate> certificate;
+ boost::
optional
<dcp::Certificate> certificate;
};
/** @class Cinema
};
/** @class Cinema
@@
-67,9
+64,9
@@
public:
, email (e)
{}
, email (e)
{}
- Cinema (
boost::shared_ptr<const cxml::Node>
);
+ Cinema (
cxml::ConstNodePtr
);
- void read_screens (
boost::shared_ptr<const cxml::Node>
);
+ void read_screens (
cxml::ConstNodePtr
);
void as_xml (xmlpp::Element *) const;
void as_xml (xmlpp::Element *) const;