Merge 1.0-seek and subtitle-content.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 6bd04572b4f771979dfee6cf568652a4d22da2fd..5d83ec6edaa484c19192f1874448810711588741 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -101,20 +101,23 @@ public:
        boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
 
-       OutputAudioFrame audio_frame_rate () const;
+       AudioFrame audio_frame_rate () const;
 
-       OutputAudioFrame time_to_audio_frames (Time) const;
-       OutputVideoFrame time_to_video_frames (Time) const;
-       Time video_frames_to_time (OutputVideoFrame) const;
-       Time audio_frames_to_time (OutputAudioFrame) const;
+       AudioFrame time_to_audio_frames (DCPTime) const;
+       VideoFrame time_to_video_frames (DCPTime) const;
+       DCPTime video_frames_to_time (VideoFrame) const;
+       DCPTime audio_frames_to_time (AudioFrame) const;
 
+       uint64_t required_disk_space () const;
+       bool should_be_enough_disk_space (double &, double &) const;
+       
        /* Proxies for some Playlist methods */
 
        ContentList content () const;
-       Time length () const;
+       DCPTime length () const;
        bool has_subtitles () const;
-       OutputVideoFrame best_video_frame_rate () const;
-       bool content_paths_valid () const;
+       VideoFrame best_video_frame_rate () const;
+       FrameRateChange active_frame_rate_change (DCPTime) const;
 
        libdcp::KDM
        make_kdm (
@@ -149,6 +152,7 @@ public:
                RESOLUTION,
                SCALER,
                WITH_SUBTITLES,
+               SIGNED,
                ENCRYPTED,
                J2K_BANDWIDTH,
                DCI_METADATA,
@@ -195,6 +199,11 @@ public:
                return _with_subtitles;
        }
 
+       /* signed is a reserved word */
+       bool is_signed () const {
+               return _signed;
+       }
+       
        bool encrypted () const {
                return _encrypted;
        }
@@ -244,6 +253,7 @@ public:
        void set_resolution (Resolution);
        void set_scaler (Scaler const *);
        void set_with_subtitles (bool);
+       void set_signed (bool);
        void set_encrypted (bool);
        void set_j2k_bandwidth (int);
        void set_dci_metadata (DCIMetadata);
@@ -295,6 +305,7 @@ private:
        Scaler const * _scaler;
        /** True if subtitles should be shown for this film */
        bool _with_subtitles;
+       bool _signed;
        bool _encrypted;
        /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;