Merge master into direct-mxf.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index e10abfa4bbed2127e14627a4282786b1c9e3dc3f..7c4c72f7b2689835cc7963b02f80956995c34fc8 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -38,6 +38,7 @@ extern "C" {
 #include "dcp_content_type.h"
 #include "util.h"
 #include "stream.h"
+#include "dci_metadata.h"
 
 class Format;
 class Job;
@@ -59,7 +60,11 @@ public:
        Film (Film const &);
        ~Film ();
 
-       std::string j2k_dir () const;
+       std::string hash_dir () const;
+       std::string j2c_path (int f, bool t) const;
+       std::string hash_path (int f) const;
+       std::string video_mxf_dir () const;
+       std::string video_mxf_filename () const;
 
        void examine_content ();
        void send_dcp_to_tms ();
@@ -78,10 +83,6 @@ public:
        std::string file (std::string f) const;
        std::string dir (std::string d) const;
 
-       std::string frame_out_path (int f, bool t) const;
-       std::string hash_out_path (int f, bool t) const;
-       std::string multichannel_audio_out_path (int c, bool t) const;
-       
        std::string content_path () const;
        ContentType content_type () const;
        
@@ -123,7 +124,6 @@ public:
                SCALER,
                TRIM_START,
                TRIM_END,
-               REEL_SIZE,
                DCP_AB,
                CONTENT_AUDIO_STREAM,
                EXTERNAL_AUDIO,
@@ -209,11 +209,6 @@ public:
                return _trim_end;
        }
 
-       boost::optional<uint64_t> reel_size () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _reel_size;
-       }
-       
        bool dcp_ab () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _dcp_ab;
@@ -281,41 +276,11 @@ public:
                return _j2k_bandwidth;
        }
 
-       std::string audio_language () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _audio_language;
-       }
-       
-       std::string subtitle_language () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _subtitle_language;
-       }
-       
-       std::string territory () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _territory;
-       }
-       
-       std::string rating () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _rating;
-       }
-       
-       std::string studio () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _studio;
-       }
-       
-       std::string facility () const {
+       DCIMetadata dci_metadata () const {
                boost::mutex::scoped_lock lm (_state_mutex);
-               return _facility;
+               return _dci_metadata;
        }
        
-       std::string package_type () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _package_type;
-       }
-
        libdcp::Size size () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _size;
@@ -371,8 +336,6 @@ public:
        void set_scaler (Scaler const *);
        void set_trim_start (int);
        void set_trim_end (int);
-       void set_reel_size (uint64_t);
-       void unset_reel_size ();
        void set_dcp_ab (bool);
        void set_content_audio_stream (boost::shared_ptr<AudioStream>);
        void set_external_audio (std::vector<std::string>);
@@ -386,13 +349,7 @@ public:
        void set_subtitle_scale (float);
        void set_colour_lut (int);
        void set_j2k_bandwidth (int);
-       void set_audio_language (std::string);
-       void set_subtitle_language (std::string);
-       void set_territory (std::string);
-       void set_rating (std::string);
-       void set_studio (std::string);
-       void set_facility (std::string);
-       void set_package_type (std::string);
+       void set_dci_metadata (DCIMetadata);
        void set_size (libdcp::Size);
        void set_length (SourceFrame);
        void unset_length ();
@@ -421,6 +378,7 @@ private:
 
        void signal_changed (Property);
        void examine_content_finished ();
+       std::string video_state_identifier () const;
 
        /** Complete path to directory containing the film metadata;
         *  must not be relative.
@@ -456,8 +414,6 @@ private:
        int _trim_start;
        /** Frames to trim off the end of the DCP */
        int _trim_end;
-       /** Approximate target reel size in bytes; if not set, use a single reel */
-       boost::optional<uint64_t> _reel_size;
        /** true to create an A/B comparison DCP, where the left half of the image
            is the video without any filters or post-processing, and the right half
            has the specified filters and post-processing.
@@ -493,15 +449,9 @@ private:
        int _colour_lut;
        /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;
-       
-       /* DCI naming stuff */
-       std::string _audio_language;
-       std::string _subtitle_language;
-       std::string _territory;
-       std::string _rating;
-       std::string _studio;
-       std::string _facility;
-       std::string _package_type;
+
+       /** DCI naming stuff */
+       DCIMetadata _dci_metadata;
 
        /* Data which are cached to speed things up */