Compile fix.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index f4065757b2f1bc61a2e53f0e4a6b7fc1ce64a2da..5aff6f0be31ef1c00176c1e67d7b2aa6de93953b 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,7 +47,7 @@ class Player;
  *  @brief A representation of some audio and video content, and details of
  *  how they should be presented in a DCP.
  *
- *  The content of a Film is held in a Playlist (created and managed by the Film)
+ *  The content of a Film is held in a Playlist (created and managed by the Film).
  */
 class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
 {
@@ -55,8 +55,8 @@ public:
        Film (std::string d);
 
        std::string info_dir () const;
-       std::string j2c_path (int f, bool t) const;
-       std::string info_path (int f) const;
+       std::string j2c_path (int, Eyes, bool) const;
+       std::string info_path (int, Eyes) const;
        std::string internal_video_mxf_dir () const;
        std::string internal_video_mxf_filename () const;
        boost::filesystem::path audio_analysis_path (boost::shared_ptr<const AudioContent>) const;
@@ -106,17 +106,12 @@ public:
 
        /* Proxies for some Playlist methods */
 
-       Playlist::ContentList content () const;
+       ContentList content () const;
 
        Time length () const;
        bool has_subtitles () const;
        OutputVideoFrame best_dcp_video_frame_rate () const;
 
-       void set_loop (int);
-       int loop () const;
-
-       void set_sequence_video (bool);
-
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -126,15 +121,18 @@ public:
                USE_DCI_NAME,
                /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */
                CONTENT,
-               LOOP,
                DCP_CONTENT_TYPE,
                CONTAINER,
+               RESOLUTION,
                SCALER,
                WITH_SUBTITLES,
                J2K_BANDWIDTH,
                DCI_METADATA,
                DCP_VIDEO_FRAME_RATE,
-               DCP_AUDIO_CHANNELS
+               DCP_AUDIO_CHANNELS,
+               /** The setting of _dcp_3d has been changed */
+               DCP_3D,
+               SEQUENCE_VIDEO,
        };
 
 
@@ -165,6 +163,11 @@ public:
                return _container;
        }
 
+       Resolution resolution () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _resolution;
+       }
+
        Scaler const * scaler () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _scaler;
@@ -196,6 +199,17 @@ public:
                return _dcp_audio_channels;
        }
 
+       bool dcp_3d () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _dcp_3d;
+       }
+
+       bool sequence_video () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _sequence_video;
+       }
+       
+
        /* SET */
 
        void set_directory (std::string);
@@ -206,13 +220,16 @@ public:
        void remove_content (boost::shared_ptr<Content>);
        void set_dcp_content_type (DCPContentType const *);
        void set_container (Ratio const *);
+       void set_resolution (Resolution);
        void set_scaler (Scaler const *);
        void set_with_subtitles (bool);
        void set_j2k_bandwidth (int);
        void set_dci_metadata (DCIMetadata);
        void set_dcp_video_frame_rate (int);
        void set_dcp_audio_channels (int);
+       void set_dcp_3d (bool);
        void set_dci_date_today ();
+       void set_sequence_video (bool);
 
        /** Emitted when some property has of the Film has changed */
        mutable boost::signals2::signal<void (Property)> Changed;
@@ -230,7 +247,7 @@ private:
        void playlist_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int);
        std::string filename_safe_name () const;
-       void add_content_weak (boost::weak_ptr<Content>);
+       void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 
        /** Log to write to */
        boost::shared_ptr<Log> _log;
@@ -251,6 +268,8 @@ private:
        DCPContentType const * _dcp_content_type;
        /** The container to put this Film in (flat, scope, etc.) */
        Ratio const * _container;
+       /** DCP resolution (2K or 4K) */
+       Resolution _resolution;
        /** Scaler algorithm to use */
        Scaler const * _scaler;
        /** True if subtitles should be shown for this film */
@@ -264,6 +283,11 @@ private:
        /** The date that we should use in a DCI name */
        boost::gregorian::date _dci_date;
        int _dcp_audio_channels;
+       /** If true, the DCP will be written in 3D mode; otherwise in 2D.
+           This will be regardless of what content is on the playlist.
+       */
+       bool _dcp_3d;
+       bool _sequence_video;
 
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;