Merge master.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 532d32bdcc5477c3ee863231743101cb714416c6..071f474aca6f645a097dee2360e88e0a05cc6141 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -22,8 +22,8 @@
  *  how they should be presented in a DCP.
  */
 
-#ifndef DVDOMATIC_FILM_H
-#define DVDOMATIC_FILM_H
+#ifndef DCPOMATIC_FILM_H
+#define DCPOMATIC_FILM_H
 
 #include <string>
 #include <vector>
@@ -63,11 +63,14 @@ public:
        std::string info_dir () const;
        std::string j2c_path (int f, bool t) const;
        std::string info_path (int f) const;
-       std::string video_mxf_dir () const;
-       std::string video_mxf_filename () const;
+       std::string internal_video_mxf_dir () const;
+       std::string internal_video_mxf_filename () const;
        std::string audio_analysis_path () const;
 
        void examine_content (boost::shared_ptr<Content>);
+       std::string dcp_video_mxf_filename () const;
+       std::string dcp_audio_mxf_filename () const;
+
        void analyse_audio ();
        void send_dcp_to_tms ();
        void make_dcp ();
@@ -106,7 +109,6 @@ public:
        ContentAudioFrame audio_length () const;
        int audio_channels () const;
        int audio_frame_rate () const;
-       int64_t audio_channel_layout () const;
        bool has_audio () const;
        
        float video_frame_rate () const;
@@ -121,6 +123,11 @@ public:
        void set_ffmpeg_subtitle_stream (FFmpegSubtitleStream);
        void set_ffmpeg_audio_stream (FFmpegAudioStream);
 
+       enum TrimType {
+               CPL,
+               ENCODE
+       };
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -139,6 +146,7 @@ public:
                TRIM_START,
                TRIM_END,
                AB,
+               TRIM_TYPE,
                AUDIO_GAIN,
                AUDIO_DELAY,
                WITH_SUBTITLES,
@@ -214,6 +222,11 @@ public:
                return _trim_end;
        }
 
+       TrimType trim_type () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _trim_type;
+       }
+
        bool ab () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _ab;
@@ -291,6 +304,7 @@ public:
        void set_trim_start (int);
        void set_trim_end (int);
        void set_ab (bool);
+       void set_trim_type (TrimType);
        void set_audio_gain (float);
        void set_audio_delay (int);
        void set_with_subtitles (bool);
@@ -323,6 +337,7 @@ private:
        void content_changed (boost::weak_ptr<Content>, int);
        boost::shared_ptr<FFmpegContent> ffmpeg () const;
        void setup_default_audio_mapping ();
+       std::string filename_safe_name () const;
 
        /** Log to write to */
        boost::shared_ptr<Log> _log;
@@ -337,7 +352,7 @@ private:
        /** Mutex for _directory */
        mutable boost::mutex _directory_mutex;
        
-       /** Name for DVD-o-matic */
+       /** Name for DCP-o-matic */
        std::string _name;
        /** True if a auto-generated DCI-compliant name should be used for our DCP */
        bool _use_dci_name;
@@ -357,6 +372,7 @@ private:
        int _trim_start;
        /** Frames to trim off the end of the DCP */
        int _trim_end;
+       TrimType _trim_type;
        /** 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.