X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=5e4c01c868cb46341f073f823182e3b77e436bba;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=0227f26c99a3b7882ee17c969eb9d2ae63ee4ddf;hpb=5f2a57d1c21c3e8067dfd1f68505b1bf96e1d7c7;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 0227f26c9..5e4c01c86 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 @@ -29,6 +29,8 @@ #include "types.h" #include "isdcf_metadata.h" #include "frame_rate_change.h" +#include "signaller.h" +#include "ratio.h" #include #include #include @@ -44,8 +46,9 @@ class Content; class Player; class Playlist; class AudioContent; -class Scaler; class Screen; +class AudioProcessor; +class AudioMapping; struct isdcf_name_test; /** @class Film @@ -55,21 +58,18 @@ struct isdcf_name_test; * * 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 internal_video_asset_dir () const; + boost::filesystem::path internal_video_asset_filename () const; - boost::filesystem::path video_mxf_filename () const; - boost::filesystem::path audio_mxf_filename () const; - boost::filesystem::path subtitle_xml_filename () const; + boost::filesystem::path audio_analysis_path () 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; @@ -103,14 +101,11 @@ public: std::vector cpls () const; - boost::shared_ptr make_player () const; - boost::shared_ptr playlist () const; - 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; @@ -126,7 +121,7 @@ public: dcp::LocalTime until, dcp::Formulation formulation ) const; - + std::list make_kdms ( std::list >, boost::filesystem::path cpl_file, @@ -135,16 +130,17 @@ public: dcp::Formulation formulation ) const; - dcp::Key key () const { - return _key; - } - int state_version () const { return _state_version; } std::string subtitle_language () const; + void make_audio_mapping_default (AudioMapping & mapping) const; + std::vector audio_output_names () const; + + void repeat_content (ContentList, int); + /** Identifiers for the parts of our state; used for signalling changes. */ @@ -157,9 +153,9 @@ public: DCP_CONTENT_TYPE, CONTAINER, RESOLUTION, - SCALER, SIGNED, ENCRYPTED, + KEY, J2K_BANDWIDTH, ISDCF_METADATA, VIDEO_FRAME_RATE, @@ -170,6 +166,7 @@ public: INTEROP, /** The setting of _burn_subtitles has changed */ BURN_SUBTITLES, + AUDIO_PROCESSOR, }; @@ -199,19 +196,19 @@ public: return _resolution; } - Scaler const * scaler () const { - return _scaler; - } - /* signed is a reserved word */ bool is_signed () const { return _signed; } - + bool encrypted () const { return _encrypted; } + dcp::Key key () const { + return _key; + } + int j2k_bandwidth () const { return _j2k_bandwidth; } @@ -244,25 +241,30 @@ public: bool burn_subtitles () const { return _burn_subtitles; } - + + AudioProcessor const * audio_processor () const { + return _audio_processor; + } + /* SET */ void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_isdcf_name (bool); - void examine_content (boost::shared_ptr, bool calculate_digest); - void examine_and_add_content (boost::shared_ptr, bool calculate_digest); + 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); + void remove_content (ContentList); void move_content_earlier (boost::shared_ptr); void move_content_later (boost::shared_ptr); void set_dcp_content_type (DCPContentType const *); void set_container (Ratio const *); void set_resolution (Resolution); - void set_scaler (Scaler const *); void set_signed (bool); void set_encrypted (bool); + void set_key (dcp::Key key); void set_j2k_bandwidth (int); void set_isdcf_metadata (ISDCFMetadata); void set_video_frame_rate (int); @@ -272,12 +274,13 @@ public: void set_sequence_video (bool); void set_interop (bool); void set_burn_subtitles (bool); + void set_audio_processor (AudioProcessor const * processor); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; /** Emitted when some property of our content has changed */ - mutable boost::signals2::signal, int)> ContentChanged; + mutable boost::signals2::signal, int, bool)> ContentChanged; /** Current version number of the state file */ static int const current_state_version; @@ -289,7 +292,7 @@ private: void signal_changed (Property); std::string video_identifier () const; void playlist_changed (); - void playlist_content_changed (boost::weak_ptr, int); + void playlist_content_changed (boost::weak_ptr, int, bool frequent); std::string filename_safe_name () const; void maybe_add_content (boost::weak_ptr, boost::weak_ptr); @@ -301,7 +304,7 @@ private: * must not be relative. */ boost::filesystem::path _directory; - + /** Name for DCP-o-matic */ std::string _name; /** True if a auto-generated ISDCF-compliant name should be used for our DCP */ @@ -312,10 +315,9 @@ private: Ratio const * _container; /** DCP resolution (2K or 4K) */ Resolution _resolution; - /** Scaler algorithm to use */ - Scaler const * _scaler; bool _signed; bool _encrypted; + dcp::Key _key; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; /** ISDCF naming stuff */ @@ -324,7 +326,7 @@ private: int _video_frame_rate; /** The date that we should use in a ISDCF name */ boost::gregorian::date _isdcf_date; - /** Number of audio channels to put in the DCP */ + /** Number of audio channels requested for the DCP */ int _audio_channels; /** If true, the DCP will be written in 3D mode; otherwise in 2D. This will be regardless of what content is on the playlist. @@ -333,13 +335,17 @@ private: bool _sequence_video; bool _interop; bool _burn_subtitles; - dcp::Key _key; + AudioProcessor const * _audio_processor; int _state_version; /** true if our state has changed since we last saved it */ mutable bool _dirty; + 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; };