projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't fail to send a problem report if there's no ffprobe.log
[dcpomatic.git]
/
src
/
lib
/
screen.h
diff --git
a/src/lib/screen.h
b/src/lib/screen.h
index 013afff856627f43bfd477921418c0b6dfde67cc..15a0785d566c5292efa5e1ffff5c53a289ecb1b4 100644
(file)
--- a/
src/lib/screen.h
+++ b/
src/lib/screen.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,9
+18,11
@@
*/
*/
+
#ifndef DCPOMATIC_SCREEN_H
#define DCPOMATIC_SCREEN_H
#ifndef DCPOMATIC_SCREEN_H
#define DCPOMATIC_SCREEN_H
+
#include "kdm_with_metadata.h"
#include "kdm_recipient.h"
#include "trusted_device.h"
#include "kdm_with_metadata.h"
#include "kdm_recipient.h"
#include "trusted_device.h"
@@
-29,11
+31,14
@@
#include <boost/optional.hpp>
#include <string>
#include <boost/optional.hpp>
#include <string>
+
class Cinema;
class Film;
class Cinema;
class Film;
+
namespace dcpomatic {
namespace dcpomatic {
+
/** @class Screen
* @brief A representation of a Screen for KDM generation.
*
/** @class Screen
* @brief A representation of a Screen for KDM generation.
*
@@
-54,17
+59,18
@@
public:
void as_xml (xmlpp::Element *) const;
std::vector<std::string> trusted_device_thumbprints () const;
void as_xml (xmlpp::Element *) const;
std::vector<std::string> trusted_device_thumbprints () const;
-
boost
::shared_ptr<Cinema> cinema;
+
std
::shared_ptr<Cinema> cinema;
std::vector<TrustedDevice> trusted_devices;
};
}
std::vector<TrustedDevice> trusted_devices;
};
}
+
KDMWithMetadataPtr
kdm_for_screen (
KDMWithMetadataPtr
kdm_for_screen (
-
boost
::shared_ptr<const Film> film,
+
std
::shared_ptr<const Film> film,
boost::filesystem::path cpl,
boost::filesystem::path cpl,
-
boost
::shared_ptr<const dcpomatic::Screen> screen,
+
std
::shared_ptr<const dcpomatic::Screen> screen,
boost::posix_time::ptime valid_from,
boost::posix_time::ptime valid_to,
dcp::Formulation formulation,
boost::posix_time::ptime valid_from,
boost::posix_time::ptime valid_to,
dcp::Formulation formulation,