Don't crash with bad content (#135).

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 2bf1a0e901b6bc15cc150eeffdec81b1815f86ce..99c214ab7bd18776fe74aa54073975151bc3a801 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -33,30 +33,26 @@
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include "util.h"
-#include "dci_metadata.h"
 #include "types.h"
-#include "ffmpeg_content.h"
 #include "playlist.h"
+#include "dci_metadata.h"
 
 class DCPContentType;
-class Job;
-class Filter;
 class Log;
-class ExamineContentJob;
-class AnalyseAudioJob;
-class ExternalAudioStream;
 class Content;
 class Player;
 
 /** @class Film
+ *
  *  @brief A representation of some audio and video content, and details of
  *  how they should be presented in a DCP.
+ *
+ *  The content of a Film is held in a Playlist (created and managed by the Film).
  */
-class Film : public boost::enable_shared_from_this<Film>
+class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
 {
 public:
        Film (std::string d);
-       Film (Film const &);
 
        std::string info_dir () const;
        std::string j2c_path (int f, bool t) const;
@@ -98,7 +94,7 @@ public:
 
        bool have_dcp () const;
 
-       boost::shared_ptr<Player> player () const;
+       boost::shared_ptr<Player> make_player () const;
        boost::shared_ptr<Playlist> playlist () const;
 
        OutputAudioFrame dcp_audio_frame_rate () const;
@@ -110,17 +106,12 @@ public:
 
        /* Proxies for some Playlist methods */
 
-       Playlist::ContentList content () const;
+       ContentList content () const;
 
        Time length () const;
        bool has_subtitles () const;
        OutputVideoFrame best_dcp_video_frame_rate () const;
 
-       void set_loop (int);
-       int loop () const;
-
-       void set_sequence_video (bool);
-
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -130,16 +121,16 @@ public:
                USE_DCI_NAME,
                /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */
                CONTENT,
-               LOOP,
                DCP_CONTENT_TYPE,
                CONTAINER,
+               RESOLUTION,
                SCALER,
                WITH_SUBTITLES,
-               COLOUR_LUT,
                J2K_BANDWIDTH,
                DCI_METADATA,
                DCP_VIDEO_FRAME_RATE,
-               DCP_AUDIO_CHANNELS
+               DCP_AUDIO_CHANNELS,
+               SEQUENCE_VIDEO
        };
 
 
@@ -170,6 +161,11 @@ public:
                return _container;
        }
 
+       Resolution resolution () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _resolution;
+       }
+
        Scaler const * scaler () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _scaler;
@@ -180,11 +176,6 @@ public:
                return _with_subtitles;
        }
 
-       int colour_lut () const {
-               boost::mutex::scoped_lock lm (_state_mutex);
-               return _colour_lut;
-       }
-
        int j2k_bandwidth () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _j2k_bandwidth;
@@ -206,6 +197,12 @@ public:
                return _dcp_audio_channels;
        }
 
+       bool sequence_video () const {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               return _sequence_video;
+       }
+       
+
        /* SET */
 
        void set_directory (std::string);
@@ -216,14 +213,15 @@ public:
        void remove_content (boost::shared_ptr<Content>);
        void set_dcp_content_type (DCPContentType const *);
        void set_container (Ratio const *);
+       void set_resolution (Resolution);
        void set_scaler (Scaler const *);
        void set_with_subtitles (bool);
-       void set_colour_lut (int);
        void set_j2k_bandwidth (int);
        void set_dci_metadata (DCIMetadata);
        void set_dcp_video_frame_rate (int);
        void set_dcp_audio_channels (int);
        void set_dci_date_today ();
+       void set_sequence_video (bool);
 
        /** Emitted when some property has of the Film has changed */
        mutable boost::signals2::signal<void (Property)> Changed;
@@ -235,13 +233,13 @@ public:
        static int const state_version;
 
 private:
-       
+
        void signal_changed (Property);
-       std::string video_state_identifier () const;
+       std::string video_identifier () const;
        void playlist_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int);
        std::string filename_safe_name () const;
-       void add_content_weak (boost::weak_ptr<Content>);
+       void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 
        /** Log to write to */
        boost::shared_ptr<Log> _log;
@@ -262,15 +260,12 @@ private:
        DCPContentType const * _dcp_content_type;
        /** The container to put this Film in (flat, scope, etc.) */
        Ratio const * _container;
+       /** DCP resolution (2K or 4K) */
+       Resolution _resolution;
        /** Scaler algorithm to use */
        Scaler const * _scaler;
        /** True if subtitles should be shown for this film */
        bool _with_subtitles;
-       /** index of colour LUT to use when converting RGB to XYZ.
-        *  0: sRGB
-        *  1: Rec 709
-        */
-       int _colour_lut;
        /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;
        /** DCI naming stuff */
@@ -280,6 +275,7 @@ private:
        /** The date that we should use in a DCI name */
        boost::gregorian::date _dci_date;
        int _dcp_audio_channels;
+       bool _sequence_video;
 
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;