Merge 1.0 in.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index f5b29466afe44574d033ae504d605f43bd6d49ba..809eabdaa9a1257cae980be9ce68a2c0b78e8452 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -42,6 +42,7 @@ class Player;
 class Playlist;
 class AudioContent;
 class Scaler;
+class Screen;
 
 /** @class Film
  *
@@ -113,6 +114,13 @@ public:
        bool has_subtitles () const;
        OutputVideoFrame best_video_frame_rate () const;
 
+       void make_kdms (
+               std::list<boost::shared_ptr<Screen> >,
+               boost::posix_time::ptime from,
+               boost::posix_time::ptime until,
+               std::string directory
+               ) const;
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -127,6 +135,7 @@ public:
                RESOLUTION,
                SCALER,
                WITH_SUBTITLES,
+               ENCRYPTED,
                J2K_BANDWIDTH,
                DCI_METADATA,
                VIDEO_FRAME_RATE,
@@ -172,6 +181,10 @@ public:
                return _with_subtitles;
        }
 
+       bool encrypted () const {
+               return _encrypted;
+       }
+
        int j2k_bandwidth () const {
                return _j2k_bandwidth;
        }
@@ -215,6 +228,7 @@ public:
        void set_resolution (Resolution);
        void set_scaler (Scaler const *);
        void set_with_subtitles (bool);
+       void set_encrypted (bool);
        void set_j2k_bandwidth (int);
        void set_dci_metadata (DCIMetadata);
        void set_video_frame_rate (int);
@@ -265,6 +279,7 @@ private:
        Scaler const * _scaler;
        /** True if subtitles should be shown for this film */
        bool _with_subtitles;
+       bool _encrypted;
        /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;
        /** DCI naming stuff */