summaryrefslogtreecommitdiff
path: root/src/lib/screen.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-05-20 22:51:49 +0200
committerCarl Hetherington <cth@carlh.net>2024-05-06 20:42:50 +0200
commita3fcbb3a76e079a5485a0552ea5d35b8d6739116 (patch)
tree58f6476b7197c0e32b5aa3d52d0859a9b04db268 /src/lib/screen.h
parenta4105c6e8dc83407abc9b12e80c958673c942888 (diff)
Use sqlite for cinema and DKDM recipient lists.
Diffstat (limited to 'src/lib/screen.h')
-rw-r--r--src/lib/screen.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/screen.h b/src/lib/screen.h
index 0a275aa34..89ebc3ab4 100644
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -23,6 +23,7 @@
#define DCPOMATIC_SCREEN_H
+#include "cinema_list.h"
#include "kdm_recipient.h"
#include "kdm_util.h"
#include "kdm_with_metadata.h"
@@ -63,12 +64,7 @@ public:
, trusted_devices (trusted_devices_)
{}
- explicit Screen (cxml::ConstNodePtr);
-
- void as_xml (xmlpp::Element *) const override;
std::vector<std::string> trusted_device_thumbprints () const;
-
- std::shared_ptr<Cinema> cinema;
std::vector<TrustedDevice> trusted_devices;
};
@@ -78,7 +74,9 @@ public:
KDMWithMetadataPtr
kdm_for_screen (
std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm,
- std::shared_ptr<const dcpomatic::Screen> screen,
+ CinemaID cinema_id,
+ Cinema const& cinema,
+ dcpomatic::Screen const& screen,
dcp::LocalTime valid_from,
dcp::LocalTime valid_to,
dcp::Formulation formulation,