Add basic timeline window.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 4d994996e86333e8a18b2be13dcdc6cf0012e162..e2f9b101a4671d2e24276d2d03d7c593736dd16d 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 ();
@@ -100,25 +103,35 @@ public:
        bool have_dcp () const;
 
        boost::shared_ptr<Player> player () const;
+       boost::shared_ptr<Playlist> playlist () const;
 
        /* Proxies for some Playlist methods */
 
+       ContentList content () const;
+
        ContentAudioFrame audio_length () const;
        int audio_channels () const;
        int audio_frame_rate () const;
        bool has_audio () const;
+
+       bool has_subtitles () const;
        
        float video_frame_rate () const;
        libdcp::Size video_size () const;
-       ContentVideoFrame video_length () const;        
+       ContentVideoFrame video_length () const;
+
+       ContentVideoFrame content_length () const;
 
-       std::vector<FFmpegSubtitleStream> ffmpeg_subtitle_streams () const;
-       boost::optional<FFmpegSubtitleStream> ffmpeg_subtitle_stream () const;
-       std::vector<FFmpegAudioStream> ffmpeg_audio_streams () const;
-       boost::optional<FFmpegAudioStream> ffmpeg_audio_stream () const;
+       std::string playlist_description () const;
 
-       void set_ffmpeg_subtitle_stream (FFmpegSubtitleStream);
-       void set_ffmpeg_audio_stream (FFmpegAudioStream);
+       void set_loop (int);
+       int loop () const;
+
+
+       enum TrimType {
+               CPL,
+               ENCODE
+       };
 
        /** Identifiers for the parts of our state;
            used for signalling changes.
@@ -128,8 +141,9 @@ public:
                NAME,
                USE_DCI_NAME,
                TRUST_CONTENT_HEADERS,
-               /** The content list has changed (i.e. content has been added, moved around or removed) */
+               /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */
                CONTENT,
+               LOOP,
                DCP_CONTENT_TYPE,
                FORMAT,
                CROP,
@@ -138,6 +152,7 @@ public:
                TRIM_START,
                TRIM_END,
                AB,
+               TRIM_TYPE,
                AUDIO_GAIN,
                AUDIO_DELAY,
                WITH_SUBTITLES,
@@ -173,11 +188,6 @@ public:
                return _trust_content_headers;
        }
 
-       ContentList content () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _content;
-       }
-
        DCPContentType const * dcp_content_type () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _dcp_content_type;
@@ -213,6 +223,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;
@@ -290,6 +305,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);
@@ -319,9 +335,10 @@ private:
        void analyse_audio_finished ();
        std::string video_state_identifier () const;
        void read_metadata ();
-       void content_changed (boost::weak_ptr<Content>, int);
-       boost::shared_ptr<FFmpegContent> ffmpeg () const;
+       void playlist_changed ();
+       void playlist_content_changed (boost::weak_ptr<Content>, int);
        void setup_default_audio_mapping ();
+       std::string filename_safe_name () const;
 
        /** Log to write to */
        boost::shared_ptr<Log> _log;
@@ -336,12 +353,11 @@ 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;
        bool _trust_content_headers;
-       ContentList _content;
        /** 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.) */
@@ -356,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.