Remove duplicate log introduced by previos.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 7d762f5995bbd80c0112b6d6b711084cecd9eb33..4c45c4ffc70efc1a22cbd1edf464c2c704c08112 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -36,7 +36,9 @@
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
+#include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/thread/mutex.hpp>
 #include <string>
 #include <vector>
 #include <inttypes.h>
@@ -45,19 +47,46 @@ namespace xmlpp {
        class Document;
 }
 
+namespace dcpomatic {
+       class Screen;
+}
+
 class DCPContentType;
 class Log;
 class Content;
 class Playlist;
 class AudioContent;
-class Screen;
 class AudioProcessor;
 class AudioMapping;
 class Ratio;
 class Job;
 class ScreenKDM;
+class Film;
 struct isdcf_name_test;
 
+class InfoFileHandle
+{
+public:
+       ~InfoFileHandle ();
+
+       FILE* get () const {
+               return _handle;
+       }
+
+       boost::filesystem::path file () const {
+               return _file;
+       }
+
+private:
+       friend class Film;
+
+       InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read);
+
+       boost::mutex::scoped_lock _lock;
+       FILE* _handle;
+       boost::filesystem::path _file;
+};
+
 /** @class Film
  *
  *  @brief A representation of some audio and video content, and details of
@@ -71,7 +100,7 @@ public:
        explicit Film (boost::optional<boost::filesystem::path> dir);
        ~Film ();
 
-       boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const;
+       boost::shared_ptr<InfoFileHandle> info_file_handle (dcpomatic::DCPTimePeriod period, bool read) const;
        boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const;
        boost::filesystem::path internal_video_asset_dir () const;
        boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const;
@@ -79,7 +108,7 @@ public:
        boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
        void send_dcp_to_tms ();
-       void make_dcp ();
+       void make_dcp (bool gui = false, bool check = true);
 
        /** @return Logger.
         *  It is safe to call this from any thread.
@@ -139,8 +168,8 @@ public:
                boost::optional<int> disable_forensic_marking_audio
                ) const;
 
-       std::list<ScreenKDM> make_kdms (
-               std::list<boost::shared_ptr<Screen> > screens,
+       std::list<boost::shared_ptr<ScreenKDM> > make_kdms (
+               std::list<boost::shared_ptr<dcpomatic::Screen> > screens,
                boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until,
@@ -171,6 +200,14 @@ public:
        bool references_dcp_video () const;
        bool references_dcp_audio () const;
 
+       void set_tolerant (bool t) {
+               _tolerant = t;
+       }
+
+       bool tolerant () const {
+               return _tolerant;
+       }
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -358,6 +395,8 @@ private:
        friend struct ::isdcf_name_test;
        template <typename> friend class ChangeSignaller;
 
+       boost::filesystem::path info_file (dcpomatic::DCPTimePeriod p) const;
+
        void signal_change (ChangeType, Property);
        void signal_change (ChangeType, int);
        std::string video_identifier () const;
@@ -366,6 +405,7 @@ private:
        void playlist_content_change (ChangeType type, boost::weak_ptr<Content>, int, bool frequent);
        void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>, bool disable_audio_analysis);
        void audio_analysis_finished ();
+       void check_settings_consistency ();
 
        static std::string const metadata_file;
 
@@ -429,6 +469,13 @@ private:
        /** film being used as a template, or 0 */
        boost::shared_ptr<Film> _template_film;
 
+       /** Be tolerant of errors in content (currently applies to DCP only).
+           Not saved as state.
+       */
+       bool _tolerant;
+
+       mutable boost::mutex _info_file_mutex;
+
        boost::signals2::scoped_connection _playlist_change_connection;
        boost::signals2::scoped_connection _playlist_order_changed_connection;
        boost::signals2::scoped_connection _playlist_content_change_connection;