X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=f55d8182fe0f7dfffbf2c23b1606800d8bf03bcc;hb=5ae794047e5ceee4502e59211f0083a60224f4bd;hp=9d1445d927b81ab7333f3197d2891ef1306de809;hpb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 9d1445d92..f55d8182f 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 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,17 +25,20 @@ #ifndef DCPOMATIC_FILM_H #define DCPOMATIC_FILM_H -#include -#include -#include +#include "util.h" +#include "types.h" +#include "isdcf_metadata.h" +#include "frame_rate_change.h" +#include "signaller.h" +#include "ratio.h" +#include +#include #include #include #include -#include -#include -#include "util.h" -#include "types.h" -#include "dci_metadata.h" +#include +#include +#include class DCPContentType; class Log; @@ -43,8 +46,8 @@ class Content; class Player; class Playlist; class AudioContent; -class Scaler; class Screen; +struct isdcf_name_test; /** @class Film * @@ -53,21 +56,18 @@ class Screen; * * The content of a Film is held in a Playlist (created and managed by the Film). */ -class Film : public boost::enable_shared_from_this, public boost::noncopyable +class Film : public boost::enable_shared_from_this, public Signaller, public boost::noncopyable { 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; - void send_dcp_to_tms (); void make_dcp (); @@ -78,8 +78,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; @@ -87,7 +85,7 @@ public: void write_metadata () const; boost::shared_ptr metadata () const; - std::string dci_name (bool if_created_now) const; + std::string isdcf_name (bool if_created_now) const; std::string dcp_name (bool if_created_now = false) const; /** @return true if our state has changed since we last saved it */ @@ -98,7 +96,7 @@ public: dcp::Size full_frame () const; dcp::Size frame_size () const; - std::list dcps () const; + std::vector cpls () const; boost::shared_ptr make_player () const; boost::shared_ptr playlist () const; @@ -106,63 +104,63 @@ public: int audio_frame_rate () const; uint64_t required_disk_space () const; - bool should_be_enough_disk_space (double &, double &) const; + bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const; /* Proxies for some Playlist methods */ ContentList content () const; DCPTime length () const; - bool has_subtitles () const; int best_video_frame_rate () const; FrameRateChange active_frame_rate_change (DCPTime) const; - dcp::KDM + dcp::EncryptedKDM make_kdm ( - boost::shared_ptr target, - boost::filesystem::path dcp, - boost::posix_time::ptime from, - boost::posix_time::ptime until + dcp::Certificate target, + boost::filesystem::path cpl_file, + dcp::LocalTime from, + dcp::LocalTime until, + dcp::Formulation formulation ) const; - std::list make_kdms ( + std::list make_kdms ( std::list >, - boost::filesystem::path dcp, - boost::posix_time::ptime from, - boost::posix_time::ptime until + boost::filesystem::path cpl_file, + dcp::LocalTime from, + dcp::LocalTime until, + dcp::Formulation formulation ) const; - dcp::Key key () const { - return _key; - } - int state_version () const { return _state_version; } + std::string subtitle_language () const; + /** Identifiers for the parts of our state; used for signalling changes. */ enum Property { NONE, NAME, - USE_DCI_NAME, - /** The playlist's content list has changed (i.e. content has been added, moved around or removed) */ + USE_ISDCF_NAME, + /** 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, + KEY, J2K_BANDWIDTH, - DCI_METADATA, + 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, }; @@ -176,8 +174,8 @@ public: return _name; } - bool use_dci_name () const { - return _use_dci_name; + bool use_isdcf_name () const { + return _use_isdcf_name; } DCPContentType const * dcp_content_type () const { @@ -192,14 +190,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; @@ -209,12 +199,16 @@ public: return _encrypted; } + dcp::Key key () const { + return _key; + } + int j2k_bandwidth () const { return _j2k_bandwidth; } - DCIMetadata dci_metadata () const { - return _dci_metadata; + ISDCFMetadata isdcf_metadata () const { + return _isdcf_metadata; } /** @return The frame rate of the DCP */ @@ -237,13 +231,18 @@ public: bool interop () const { return _interop; } + + bool burn_subtitles () const { + return _burn_subtitles; + } /* SET */ void set_directory (boost::filesystem::path); void set_name (std::string); - void set_use_dci_name (bool); + 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); @@ -252,18 +251,18 @@ 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_key (dcp::Key key); void set_j2k_bandwidth (int); - void set_dci_metadata (DCIMetadata); + void set_isdcf_metadata (ISDCFMetadata); void set_video_frame_rate (int); void set_audio_channels (int); void set_three_d (bool); - void set_dci_date_today (); + 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; @@ -276,6 +275,8 @@ public: private: + friend struct ::isdcf_name_test; + void signal_changed (Property); std::string video_identifier () const; void playlist_changed (); @@ -294,28 +295,24 @@ private: /** Name for DCP-o-matic */ std::string _name; - /** True if a auto-generated DCI-compliant name should be used for our DCP */ - bool _use_dci_name; + /** True if a auto-generated ISDCF-compliant name should be used for our DCP */ + bool _use_isdcf_name; /** The type of content that this Film represents (feature, trailer etc.) */ DCPContentType const * _dcp_content_type; /** The container to put this Film in (flat, scope, etc.) */ 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 */ int _j2k_bandwidth; - /** DCI naming stuff */ - DCIMetadata _dci_metadata; + /** ISDCF naming stuff */ + ISDCFMetadata _isdcf_metadata; /** Frames per second to run our DCP at */ int _video_frame_rate; - /** The date that we should use in a DCI name */ - boost::gregorian::date _dci_date; + /** The date that we should use in a ISDCF name */ + boost::gregorian::date _isdcf_date; /** Number of audio channels to put in the DCP */ int _audio_channels; /** If true, the DCP will be written in 3D mode; otherwise in 2D. @@ -324,6 +321,7 @@ private: bool _three_d; bool _sequence_video; bool _interop; + bool _burn_subtitles; dcp::Key _key; int _state_version; @@ -331,8 +329,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