Merge master and multifarious hackery.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 6dd2b446dc499be4898538d7d4bf25697e00866d..84f0b0233ac6247634a9499b94b2c0cc30f8a934 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -39,7 +39,7 @@
 #include "playlist.h"
 
 class DCPContentType;
-class Format;
+class Container;
 class Job;
 class Filter;
 class Log;
@@ -56,7 +56,7 @@ class Player;
 class Film : public boost::enable_shared_from_this<Film>
 {
 public:
-       Film (std::string d, bool must_exist = true);
+       Film (std::string d);
        Film (Film const &);
 
        std::string info_dir () const;
@@ -86,9 +86,9 @@ public:
        std::string file (std::string f) const;
        std::string dir (std::string d) const;
 
+       void read_metadata ();
        void write_metadata () const;
 
-       libdcp::Size cropped_size (libdcp::Size) const;
        std::string dci_name (bool if_created_now) const;
        std::string dcp_name (bool if_created_now = false) const;
 
@@ -131,13 +131,9 @@ public:
                CONTENT,
                LOOP,
                DCP_CONTENT_TYPE,
-               FORMAT,
-               CROP,
-               FILTERS,
+               CONTAINER,
                SCALER,
                AB,
-               AUDIO_GAIN,
-               AUDIO_DELAY,
                WITH_SUBTITLES,
                SUBTITLE_OFFSET,
                SUBTITLE_SCALE,
@@ -170,19 +166,9 @@ public:
                return _dcp_content_type;
        }
 
-       Format const * format () const {
+       Container const * container () const {
                boost::mutex::scoped_lock lm (_state_mutex);
-               return _format;
-       }
-
-       Crop crop () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _crop;
-       }
-
-       std::vector<Filter const *> filters () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _filters;
+               return _container;
        }
 
        Scaler const * scaler () const {
@@ -195,16 +181,6 @@ public:
                return _ab;
        }
 
-       float audio_gain () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _audio_gain;
-       }
-
-       int audio_delay () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _audio_delay;
-       }
-
        bool with_subtitles () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _with_subtitles;
@@ -241,6 +217,11 @@ public:
                return _dcp_video_frame_rate;
        }
 
+       int dcp_audio_channels () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _dcp_audio_channels;
+       }
+
        /* SET */
 
        void set_directory (std::string);
@@ -249,17 +230,9 @@ public:
        void add_content (boost::shared_ptr<Content>);
        void remove_content (boost::shared_ptr<Content>);
        void set_dcp_content_type (DCPContentType const *);
-       void set_format (Format const *);
-       void set_crop (Crop);
-       void set_left_crop (int);
-       void set_right_crop (int);
-       void set_top_crop (int);
-       void set_bottom_crop (int);
-       void set_filters (std::vector<Filter const *>);
+       void set_container (Container const *);
        void set_scaler (Scaler const *);
        void set_ab (bool);
-       void set_audio_gain (float);
-       void set_audio_delay (int);
        void set_with_subtitles (bool);
        void set_subtitle_offset (int);
        void set_subtitle_scale (float);
@@ -285,7 +258,6 @@ private:
        void signal_changed (Property);
        void analyse_audio_finished ();
        std::string video_state_identifier () const;
-       void read_metadata ();
        void playlist_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int);
        std::string filename_safe_name () const;
@@ -309,12 +281,8 @@ private:
        bool _use_dci_name;
        /** The type of content that this Film represents (feature, trailer etc.) */
        DCPContentType const * _dcp_content_type;
-       /** The format to present this Film in (flat, scope, etc.) */
-       Format const * _format;
-       /** The crop to apply to the source */
-       Crop _crop;
-       /** Video filters that should be used when generating DCPs */
-       std::vector<Filter const *> _filters;
+       /** The container to put this Film in (flat, scope, etc.) */
+       Container const * _container;
        /** Scaler algorithm to use */
        Scaler const * _scaler;
        /** true to create an A/B comparison DCP, where the left half of the image
@@ -322,10 +290,6 @@ private:
            has the specified filters and post-processing.
        */
        bool _ab;
-       /** Gain to apply to audio in dB */
-       float _audio_gain;
-       /** Delay to apply to audio (positive moves audio later) in milliseconds */
-       int _audio_delay;
        /** True if subtitles should be shown for this film */
        bool _with_subtitles;
        /** y offset for placing subtitles, in source pixels; +ve is further down
@@ -347,6 +311,7 @@ private:
        int _dcp_video_frame_rate;
        /** The date that we should use in a DCI name */
        boost::gregorian::date _dci_date;
+       int _dcp_audio_channels;
 
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;