Merge 1.0 in.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index c3c53ecd1edfccab022206eb4f9bb5fb3a3175dd..809eabdaa9a1257cae980be9ce68a2c0b78e8452 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -41,6 +41,8 @@ class Content;
 class Player;
 class Playlist;
 class AudioContent;
+class Scaler;
+class Screen;
 
 /** @class Film
  *
@@ -52,7 +54,7 @@ class AudioContent;
 class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
 {
 public:
-       Film (std::string d);
+       Film (boost::filesystem::path);
 
        std::string info_dir () const;
        std::string j2c_path (int, Eyes, bool) const;
@@ -112,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.
        */
@@ -126,6 +135,7 @@ public:
                RESOLUTION,
                SCALER,
                WITH_SUBTITLES,
+               ENCRYPTED,
                J2K_BANDWIDTH,
                DCI_METADATA,
                VIDEO_FRAME_RATE,
@@ -133,6 +143,7 @@ public:
                /** The setting of _three_d has been changed */
                THREE_D,
                SEQUENCE_VIDEO,
+               INTEROP,
        };
 
 
@@ -170,6 +181,10 @@ public:
                return _with_subtitles;
        }
 
+       bool encrypted () const {
+               return _encrypted;
+       }
+
        int j2k_bandwidth () const {
                return _j2k_bandwidth;
        }
@@ -194,6 +209,10 @@ public:
        bool sequence_video () const {
                return _sequence_video;
        }
+
+       bool interop () const {
+               return _interop;
+       }
        
 
        /* SET */
@@ -209,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);
@@ -216,6 +236,7 @@ public:
        void set_three_d (bool);
        void set_dci_date_today ();
        void set_sequence_video (bool);
+       void set_interop (bool);
 
        /** Emitted when some property has of the Film has changed */
        mutable boost::signals2::signal<void (Property)> Changed;
@@ -258,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 */
@@ -273,6 +295,7 @@ private:
        */
        bool _three_d;
        bool _sequence_video;
+       bool _interop;
 
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;