X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=0c195905613371eea6a119420c00f78478f528b1;hb=895b386b6751afd3d068155f4ea71e762297672a;hp=d251c7fcc3e6ddef4e70e729285b96323d8bd5e0;hpb=75538d19688ad8c29c5949de9bff9f044c713936;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index d251c7fcc..0c1959056 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -36,7 +36,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -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,15 +100,15 @@ public: explicit Film (boost::optional dir); ~Film (); - boost::filesystem::path info_file (DCPTimePeriod p) const; + boost::shared_ptr 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 (DCPTimePeriod p) const; + boost::filesystem::path internal_video_asset_filename (dcpomatic::DCPTimePeriod p) const; boost::filesystem::path audio_analysis_path (boost::shared_ptr) 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. @@ -123,14 +152,14 @@ public: /* Proxies for some Playlist methods */ ContentList content () const; - DCPTime length () const; + dcpomatic::DCPTime length () const; int best_video_frame_rate () const; - FrameRateChange active_frame_rate_change (DCPTime) const; + FrameRateChange active_frame_rate_change (dcpomatic::DCPTime) const; std::pair speed_up_range (int dcp_frame_rate) const; dcp::EncryptedKDM make_kdm ( dcp::Certificate recipient, - std::vector trusted_devices, + std::vector trusted_devices, boost::filesystem::path cpl_file, dcp::LocalTime from, dcp::LocalTime until, @@ -139,8 +168,8 @@ public: boost::optional disable_forensic_marking_audio ) const; - std::list make_kdms ( - std::list > screens, + std::list > make_kdms ( + std::list > screens, boost::filesystem::path cpl_file, boost::posix_time::ptime from, boost::posix_time::ptime until, @@ -155,11 +184,6 @@ public: std::string subtitle_language () const; - void make_audio_mapping_default ( - AudioMapping & mapping, - boost::optional filename = boost::optional () - ) const; - std::vector audio_output_names () const; void repeat_content (ContentList, int); @@ -168,14 +192,22 @@ public: return _playlist; } - std::list reels () const; + std::list reels () const; std::list mapped_audio_channels () const; - std::string content_summary (DCPTimePeriod period) const; + std::string content_summary (dcpomatic::DCPTimePeriod period) const; 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. */ @@ -205,7 +237,9 @@ public: REEL_TYPE, REEL_LENGTH, UPLOAD_AFTER_MAKE_DCP, - REENCODE_J2K + REENCODE_J2K, + MARKERS, + RATINGS }; @@ -301,6 +335,14 @@ public: return _reencode_j2k; } + boost::optional marker (dcp::Marker type) const; + std::map markers () const { + return _markers; + } + + std::vector ratings () const { + return _ratings; + } /* SET */ @@ -321,7 +363,7 @@ public: void set_key (dcp::Key key); void set_j2k_bandwidth (int); void set_isdcf_metadata (ISDCFMetadata); - void set_video_frame_rate (int); + void set_video_frame_rate (int rate, bool user_explicit = false); void set_audio_channels (int); void set_three_d (bool); void set_isdcf_date_today (); @@ -332,6 +374,9 @@ public: void set_reel_length (int64_t); void set_upload_after_make_dcp (bool); void set_reencode_j2k (bool); + void set_marker (dcp::Marker type, dcpomatic::DCPTime time); + void unset_marker (dcp::Marker type); + void set_ratings (std::vector r); /** Emitted when some property has of the Film is about to change or has changed */ mutable boost::signals2::signal Change; @@ -339,6 +384,9 @@ public: /** Emitted when some property of our content has changed */ mutable boost::signals2::signal, int, bool)> ContentChange; + /** Emitted when we have something important to tell the user */ + boost::signals2::signal Message; + /** Current version number of the state file */ static int const current_state_version; @@ -347,6 +395,8 @@ private: friend struct ::isdcf_name_test; template 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; @@ -406,6 +456,10 @@ private: int64_t _reel_length; bool _upload_after_make_dcp; bool _reencode_j2k; + /** true if the user has ever explicitly set the video frame rate of this film */ + bool _user_explicit_video_frame_rate; + std::map _markers; + std::vector _ratings; int _state_version; @@ -414,6 +468,13 @@ private: /** film being used as a template, or 0 */ boost::shared_ptr _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;