Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 64f6f9ff8632a275cf05f2233b2faf344a2aadf6..d2e164f1d5352e4ce844b7e4dbaa5dfa4f783f5f 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -93,6 +93,16 @@ public:
 
        void signal_subtitle_stream_changed ();
 
+       boost::optional<std::string> decryption_key () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _decryption_key;
+       }
+
+       bool encrypted () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _encrypted;
+       }
+
 private:
        void add_properties (std::list<UserProperty> &) const;
 
@@ -110,6 +120,8 @@ private:
        boost::optional<AVColorTransferCharacteristic> _color_trc;
        boost::optional<AVColorSpace> _colorspace;
        boost::optional<int> _bits_per_pixel;
+       boost::optional<std::string> _decryption_key;
+       bool _encrypted;
 };
 
 #endif