Remove swaroop variant.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index cf1849971450659f5d12ccb64d0b1c681a825561..f933e4195203ef4b5b0d517eb2ffe0be328d0e7b 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -21,9 +21,6 @@
 #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"
 
@@ -102,27 +99,6 @@ public:
 
        void signal_subtitle_stream_changed ();
 
-#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;
 
@@ -140,11 +116,6 @@ private:
        boost::optional<AVColorTransferCharacteristic> _color_trc;
        boost::optional<AVColorSpace> _colorspace;
        boost::optional<int> _bits_per_pixel;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       bool _encrypted;
-       boost::optional<EncryptedECinemaKDM> _kdm;
-       boost::optional<std::string> _id;
-#endif
 };
 
 #endif