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 497320c5e0bbb9c3cb8f218fff1fabc791138eab..99c214ab7bd18776fe74aa54073975151bc3a801 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -106,14 +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_sequence_video (bool);
-
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -131,7 +129,8 @@ public:
                J2K_BANDWIDTH,
                DCI_METADATA,
                DCP_VIDEO_FRAME_RATE,
-               DCP_AUDIO_CHANNELS
+               DCP_AUDIO_CHANNELS,
+               SEQUENCE_VIDEO
        };
 
 
@@ -198,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,6 +221,7 @@ public:
        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;
@@ -233,7 +239,7 @@ private:
        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;
@@ -269,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;