Fix crash when changing DCP audio channel count.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index ec64c39130c6398670d298f7a76f08e7f710bdb3..a1dfc60940bfd917ed0365d9ccda6838d4a2f07e 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -165,7 +165,8 @@ public:
 
        std::string content_summary (DCPTimePeriod period) const;
 
-       std::list<std::string> fix_conflicting_settings ();
+       bool references_dcp_video () const;
+       bool references_dcp_audio () const;
 
        /** Identifiers for the parts of our state;
            used for signalling changes.
@@ -293,7 +294,7 @@ public:
        void set_directory (boost::filesystem::path);
        void set_name (std::string);
        void set_use_isdcf_name (bool);
-       void examine_and_add_content (boost::shared_ptr<Content>);
+       void examine_and_add_content (boost::shared_ptr<Content> content, bool disable_audio_analysis = false);
        void add_content (boost::shared_ptr<Content>);
        void remove_content (boost::shared_ptr<Content>);
        void remove_content (ContentList);
@@ -336,7 +337,7 @@ private:
        void playlist_changed ();
        void playlist_order_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
-       void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
+       void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
        void audio_analysis_finished ();
 
        static std::string const metadata_file;