Partial attempt at cleanup of naming straight vs DCI.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 919cecc220c552688931148f0ffced1efa55ceda..a1cf26bc61896f8ac15620cf11c6a5ac06ab10a1 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -71,6 +71,15 @@ public:
                return _state.name;
        }
 
+       /** @return name to give the DCP */
+       std::string dcp_name () const {
+               return _state.dcp_name ();
+       }
+
+       bool use_dci_name () const {
+               return _state.use_dci_name;
+       }
+
        /** @return number of pixels to crop from the sides of the original picture */
        Crop crop () const {
                return _state.crop;
@@ -123,6 +132,14 @@ public:
        bool with_subtitles () const {
                return _state.with_subtitles;
        }
+
+       int subtitle_offset () const {
+               return _state.subtitle_offset;
+       }
+
+       float subtitle_scale () const {
+               return _state.subtitle_scale;
+       }
        
        void set_filters (std::vector<Filter const *> const &);
 
@@ -138,6 +155,7 @@ public:
        void set_dcp_ab (bool);
        
        void set_name (std::string);
+       void set_use_dci_name (bool);
        void set_content (std::string);
        void set_top_crop (int);
        void set_bottom_crop (int);
@@ -149,6 +167,15 @@ public:
        void set_audio_delay (int);
        void set_still_duration (int);
        void set_with_subtitles (bool);
+       void set_subtitle_offset (int);
+       void set_subtitle_scale (float);
+       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);
 
        /** @return size, in pixels, of the source (ignoring cropping) */
        Size size () const {
@@ -183,7 +210,35 @@ public:
        bool has_subtitles () const {
                return _state.has_subtitles;
        }
+
+       std::string audio_language () const {
+               return _state.audio_language;
+       }
+
+       std::string subtitle_language () const {
+               return _state.subtitle_language;
+       }
        
+       std::string territory () const {
+               return _state.territory;
+       }
+
+       std::string rating () const {
+               return _state.rating;
+       }
+
+       std::string studio () const {
+               return _state.studio;
+       }
+
+       std::string facility () const {
+               return _state.facility;
+       }
+
+       std::string package_type () const {
+               return _state.package_type;
+       }
+
        std::string j2k_dir () const;
 
        std::vector<std::string> audio_files () const;
@@ -193,6 +248,7 @@ public:
        int num_thumbs () const;
        int thumb_frame (int) const;
        std::string thumb_file (int) const;
+       std::pair<Position, std::string> thumb_subtitle (int) const;
 
        void copy_from_dvd_post_gui ();
        void examine_content ();
@@ -229,6 +285,10 @@ public:
                AUDIO_SAMPLE_RATE,
                STILL_DURATION,
                WITH_SUBTITLES,
+               SUBTITLE_OFFSET,
+               SUBTITLE_SCALE,
+               USE_DCI_NAME,
+               DCI_METADATA
        };
 
        boost::shared_ptr<FilmState> state_copy () const;