X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=cca31d3061ce3e116581fc7612e129beb4788648;hb=ff96cc9c9e33fbe9dea02ea2d397144f9c9ac8c9;hp=67d00aa54afe8d977a26ffc1edddb18a5a36b009;hpb=e846c98e5f64d3179fb2eebefb0c76b57bc53b93;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 67d00aa54..cca31d306 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,19 +25,19 @@ #ifndef DCPOMATIC_FILM_H #define DCPOMATIC_FILM_H -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "util.h" #include "types.h" #include "isdcf_metadata.h" #include "frame_rate_change.h" +#include "ratio.h" +#include +#include +#include +#include +#include +#include +#include +#include class DCPContentType; class Log; @@ -45,9 +45,8 @@ class Content; class Player; class Playlist; class AudioContent; -class Scaler; class Screen; -class isdcf_name_test; +struct isdcf_name_test; /** @class Film * @@ -60,16 +59,17 @@ class Film : public boost::enable_shared_from_this, public boost::noncopya { public: Film (boost::filesystem::path, bool log = true); + ~Film (); - boost::filesystem::path info_dir () const; + boost::filesystem::path info_file () const; boost::filesystem::path j2c_path (int, Eyes, bool) const; - boost::filesystem::path info_path (int, Eyes) const; boost::filesystem::path internal_video_mxf_dir () const; boost::filesystem::path internal_video_mxf_filename () const; boost::filesystem::path audio_analysis_dir () const; boost::filesystem::path video_mxf_filename () const; boost::filesystem::path audio_mxf_filename () const; + boost::filesystem::path subtitle_xml_filename () const; void send_dcp_to_tms (); void make_dcp (); @@ -81,8 +81,6 @@ public: return _log; } - int encoded_frames () const; - boost::filesystem::path file (boost::filesystem::path f) const; boost::filesystem::path dir (boost::filesystem::path d) const; @@ -115,23 +113,24 @@ public: ContentList content () const; DCPTime length () const; - bool has_subtitles () const; int best_video_frame_rate () const; FrameRateChange active_frame_rate_change (DCPTime) const; dcp::EncryptedKDM make_kdm ( - boost::shared_ptr target, + dcp::Certificate target, boost::filesystem::path cpl_file, dcp::LocalTime from, - dcp::LocalTime until + dcp::LocalTime until, + dcp::Formulation formulation ) const; std::list make_kdms ( std::list >, boost::filesystem::path cpl_file, dcp::LocalTime from, - dcp::LocalTime until + dcp::LocalTime until, + dcp::Formulation formulation ) const; dcp::Key key () const { @@ -142,6 +141,8 @@ public: return _state_version; } + std::string subtitle_language () const; + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -149,23 +150,23 @@ public: NONE, NAME, USE_ISDCF_NAME, - /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */ + /** The playlist's content list has changed (i.e. content has been added or removed) */ CONTENT, DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, - SCALER, - WITH_SUBTITLES, SIGNED, ENCRYPTED, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, AUDIO_CHANNELS, - /** The setting of _three_d has been changed */ + /** The setting of _three_d has changed */ THREE_D, SEQUENCE_VIDEO, INTEROP, + /** The setting of _burn_subtitles has changed */ + BURN_SUBTITLES, }; @@ -195,14 +196,6 @@ public: return _resolution; } - Scaler const * scaler () const { - return _scaler; - } - - bool with_subtitles () const { - return _with_subtitles; - } - /* signed is a reserved word */ bool is_signed () const { return _signed; @@ -240,6 +233,10 @@ public: bool interop () const { return _interop; } + + bool burn_subtitles () const { + return _burn_subtitles; + } /* SET */ @@ -247,6 +244,7 @@ public: void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_isdcf_name (bool); + void examine_content (boost::shared_ptr); void examine_and_add_content (boost::shared_ptr); void add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); @@ -255,8 +253,6 @@ public: 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_signed (bool); void set_encrypted (bool); void set_j2k_bandwidth (int); @@ -267,6 +263,7 @@ public: void set_isdcf_date_today (); void set_sequence_video (bool); void set_interop (bool); + void set_burn_subtitles (bool); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; @@ -279,7 +276,7 @@ public: private: - friend class ::isdcf_name_test; + friend struct ::isdcf_name_test; void signal_changed (Property); std::string video_identifier () const; @@ -307,10 +304,6 @@ private: 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; bool _signed; bool _encrypted; /** bandwidth for J2K files in bits per second */ @@ -329,6 +322,7 @@ private: bool _three_d; bool _sequence_video; bool _interop; + bool _burn_subtitles; dcp::Key _key; int _state_version; @@ -336,8 +330,12 @@ private: /** true if our state has changed since we last saved it */ mutable bool _dirty; - friend class paths_test; - friend class film_metadata_test; + boost::signals2::scoped_connection _playlist_changed_connection; + boost::signals2::scoped_connection _playlist_content_changed_connection; + std::list _job_connections; + + friend struct paths_test; + friend struct film_metadata_test; }; #endif