Trying to create export audio encoders with between 9 and 15 channels

[dcpomatic.git] / src / lib / screen.h

diff --git a/src/lib/screen.h b/src/lib/screen.h
index eff2e5ffe71c96b4ca390cf634673f83347a786c..013afff856627f43bfd477921418c0b6dfde67cc 100644 (file)
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,30 +21,18 @@
 #ifndef DCPOMATIC_SCREEN_H
 #define DCPOMATIC_SCREEN_H
 
+#include "kdm_with_metadata.h"
+#include "kdm_recipient.h"
+#include "trusted_device.h"
 #include <dcp/certificate.h>
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
 #include <string>
 
 class Cinema;
+class Film;
 
-class TrustedDevice
-{
-public:
-       explicit TrustedDevice (std::string);
-       explicit TrustedDevice (dcp::Certificate);
-
-       boost::optional<dcp::Certificate> certificate () const {
-               return _certificate;
-       }
-
-       std::string thumbprint () const;
-       std::string as_string () const;
-
-private:
-       boost::optional<dcp::Certificate> _certificate;
-       boost::optional<std::string> _thumbprint;
-};
+namespace dcpomatic {
 
 /** @class Screen
  *  @brief A representation of a Screen for KDM generation.
@@ -53,13 +41,12 @@ private:
  *  `recipient' (i.e. the mediablock) and the certificates/thumbprints
  *  of any trusted devices.
  */
-class Screen
+class Screen : public KDMRecipient
 {
 public:
-       Screen (std::string const & n, boost::optional<dcp::Certificate> rec, std::vector<TrustedDevice> td)
-               : name (n)
-               , recipient (rec)
-               , trusted_devices (td)
+       Screen (std::string const & name_, std::string const & notes_, boost::optional<dcp::Certificate> recipient_, std::vector<TrustedDevice> trusted_devices_)
+               : KDMRecipient (name_, notes_, recipient_)
+               , trusted_devices (trusted_devices_)
        {}
 
        explicit Screen (cxml::ConstNodePtr);
@@ -68,10 +55,22 @@ public:
        std::vector<std::string> trusted_device_thumbprints () const;
 
        boost::shared_ptr<Cinema> cinema;
-       std::string name;
-       std::string notes;
-       boost::optional<dcp::Certificate> recipient;
        std::vector<TrustedDevice> trusted_devices;
 };
 
+}
+
+KDMWithMetadataPtr
+kdm_for_screen (
+       boost::shared_ptr<const Film> film,
+       boost::filesystem::path cpl,
+       boost::shared_ptr<const dcpomatic::Screen> screen,
+       boost::posix_time::ptime valid_from,
+       boost::posix_time::ptime valid_to,
+       dcp::Formulation formulation,
+       bool disable_forensic_marking_picture,
+       boost::optional<int> disable_forensic_marking_audio
+       );
+
+
 #endif