Merge branch '1.0' into 1.0-seek

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 6bd04572b4f771979dfee6cf568652a4d22da2fd..a0ace99811005d5b93bffcffa6d7cbb039f7a539 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -103,18 +103,19 @@ public:
 
        OutputAudioFrame 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;
+       OutputAudioFrame time_to_audio_frames (DCPTime) const;
+       OutputVideoFrame time_to_video_frames (DCPTime) const;
+       DCPTime video_frames_to_time (OutputVideoFrame) const;
+       DCPTime audio_frames_to_time (OutputAudioFrame) 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;
+       FrameRateChange active_frame_rate_change (DCPTime) const;
 
        libdcp::KDM
        make_kdm (
@@ -149,6 +150,7 @@ public:
                RESOLUTION,
                SCALER,
                WITH_SUBTITLES,
+               SIGNED,
                ENCRYPTED,
                J2K_BANDWIDTH,
                DCI_METADATA,
@@ -195,6 +197,11 @@ public:
                return _with_subtitles;
        }
 
+       /* signed is a reserved word */
+       bool is_signed () const {
+               return _signed;
+       }
+       
        bool encrypted () const {
                return _encrypted;
        }
@@ -244,6 +251,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 +303,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;