Another macOS std::list boost::thread SNAFU.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 8871301b16ae900d10c91b7854393bb1e8eef251..cf1849971450659f5d12ccb64d0b1c681a825561 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -21,6 +21,9 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+#include "encrypted_ecinema_kdm.h"
+#endif
 #include "content.h"
 #include "audio_stream.h"
 
@@ -41,6 +44,7 @@ public:
        /** The chosen subtitle stream, or something about it */
        static int const SUBTITLE_STREAM;
        static int const FILTERS;
+       static int const KDM;
 };
 
 class FFmpegContent : public Content
@@ -98,16 +102,27 @@ public:
 
        void signal_subtitle_stream_changed ();
 
-       boost::optional<std::string> decryption_key () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _decryption_key;
-       }
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 
        bool encrypted () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _encrypted;
        }
 
+       void add_kdm (EncryptedECinemaKDM kdm);
+
+       boost::optional<EncryptedECinemaKDM> kdm () const {
+               return _kdm;
+       }
+
+       boost::optional<std::string> id () const {
+               return _id;
+       }
+
+       bool kdm_timing_window_valid () const;
+
+#endif
+
 private:
        void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
@@ -125,8 +140,11 @@ private:
        boost::optional<AVColorTransferCharacteristic> _color_trc;
        boost::optional<AVColorSpace> _colorspace;
        boost::optional<int> _bits_per_pixel;
-       boost::optional<std::string> _decryption_key;
+#ifdef DCPOMATIC_VARIANT_SWAROOP
        bool _encrypted;
+       boost::optional<EncryptedECinemaKDM> _kdm;
+       boost::optional<std::string> _id;
+#endif
 };
 
 #endif