X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=6bd04572b4f771979dfee6cf568652a4d22da2fd;hb=417136d2141af3fa30411c327b4c2479dbde6e39;hp=7279541e4dda7ebffe00cce4d86be0916cfcc658;hpb=38fda7888663429d452b9c71902e8bb5239dd720;p=dcpomatic.git diff --git a/src/lib/film.h b/src/lib/film.h index 7279541e4..6bd04572b 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -28,19 +28,23 @@ #include #include #include -#include -#include #include #include +#include +#include +#include #include "util.h" #include "types.h" -#include "playlist.h" #include "dci_metadata.h" class DCPContentType; class Log; class Content; class Player; +class Playlist; +class AudioContent; +class Scaler; +class Screen; /** @class Film * @@ -52,17 +56,17 @@ class Player; class Film : public boost::enable_shared_from_this, public boost::noncopyable { public: - Film (std::string d); + Film (boost::filesystem::path); - std::string info_dir () const; - std::string j2c_path (int, Eyes, bool) const; - std::string info_path (int, Eyes) const; - std::string internal_video_mxf_dir () const; - std::string internal_video_mxf_filename () const; + boost::filesystem::path info_dir () 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_path (boost::shared_ptr) const; - std::string video_mxf_filename () const; - std::string audio_mxf_filename () const; + boost::filesystem::path video_mxf_filename () const; + boost::filesystem::path audio_mxf_filename () const; void send_dcp_to_tms (); void make_dcp (); @@ -76,8 +80,8 @@ public: int encoded_frames () const; - std::string file (std::string f) const; - std::string dir (std::string d) const; + boost::filesystem::path file (boost::filesystem::path f) const; + boost::filesystem::path dir (boost::filesystem::path d) const; void read_metadata (); void write_metadata () const; @@ -92,7 +96,7 @@ public: libdcp::Size full_frame () const; - bool have_dcp () const; + std::list dcps () const; boost::shared_ptr make_player () const; boost::shared_ptr playlist () const; @@ -107,10 +111,29 @@ public: /* Proxies for some Playlist methods */ ContentList content () const; - Time length () const; bool has_subtitles () const; OutputVideoFrame best_video_frame_rate () const; + bool content_paths_valid () const; + + libdcp::KDM + make_kdm ( + boost::shared_ptr target, + boost::filesystem::path dcp, + boost::posix_time::ptime from, + boost::posix_time::ptime until + ) const; + + std::list make_kdms ( + std::list >, + boost::filesystem::path dcp, + boost::posix_time::ptime from, + boost::posix_time::ptime until + ) const; + + libdcp::Key key () const { + return _key; + } /** Identifiers for the parts of our state; used for signalling changes. @@ -126,6 +149,7 @@ public: RESOLUTION, SCALER, WITH_SUBTITLES, + ENCRYPTED, J2K_BANDWIDTH, DCI_METADATA, VIDEO_FRAME_RATE, @@ -133,96 +157,94 @@ public: /** The setting of _three_d has been changed */ THREE_D, SEQUENCE_VIDEO, + INTEROP, }; /* GET */ - std::string directory () const { - boost::mutex::scoped_lock lm (_directory_mutex); + boost::filesystem::path directory () const { return _directory; } std::string name () const { - boost::mutex::scoped_lock lm (_state_mutex); return _name; } bool use_dci_name () const { - boost::mutex::scoped_lock lm (_state_mutex); return _use_dci_name; } DCPContentType const * dcp_content_type () const { - boost::mutex::scoped_lock lm (_state_mutex); return _dcp_content_type; } Ratio const * container () const { - boost::mutex::scoped_lock lm (_state_mutex); return _container; } Resolution resolution () const { - boost::mutex::scoped_lock lm (_state_mutex); return _resolution; } Scaler const * scaler () const { - boost::mutex::scoped_lock lm (_state_mutex); return _scaler; } bool with_subtitles () const { - boost::mutex::scoped_lock lm (_state_mutex); return _with_subtitles; } + bool encrypted () const { + return _encrypted; + } + int j2k_bandwidth () const { - boost::mutex::scoped_lock lm (_state_mutex); return _j2k_bandwidth; } DCIMetadata dci_metadata () const { - boost::mutex::scoped_lock lm (_state_mutex); return _dci_metadata; } /** @return The frame rate of the DCP */ int video_frame_rate () const { - boost::mutex::scoped_lock lm (_state_mutex); return _video_frame_rate; } int audio_channels () const { - boost::mutex::scoped_lock lm (_state_mutex); return _audio_channels; } bool three_d () const { - boost::mutex::scoped_lock lm (_state_mutex); return _three_d; } bool sequence_video () const { - boost::mutex::scoped_lock lm (_state_mutex); return _sequence_video; } + + bool interop () const { + return _interop; + } /* SET */ - void set_directory (std::string); + void set_directory (boost::filesystem::path); void set_name (std::string); void set_use_dci_name (bool); void examine_and_add_content (boost::shared_ptr); void add_content (boost::shared_ptr); void remove_content (boost::shared_ptr); + 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_with_subtitles (bool); + void set_encrypted (bool); void set_j2k_bandwidth (int); void set_dci_metadata (DCIMetadata); void set_video_frame_rate (int); @@ -230,6 +252,7 @@ public: void set_three_d (bool); void set_dci_date_today (); void set_sequence_video (bool); + void set_interop (bool); /** Emitted when some property has of the Film has changed */ mutable boost::signals2::signal Changed; @@ -256,9 +279,7 @@ private: /** Complete path to directory containing the film metadata; * must not be relative. */ - std::string _directory; - /** Mutex for _directory */ - mutable boost::mutex _directory_mutex; + boost::filesystem::path _directory; /** Name for DCP-o-matic */ std::string _name; @@ -274,6 +295,7 @@ private: Scaler const * _scaler; /** True if subtitles should be shown for this film */ bool _with_subtitles; + bool _encrypted; /** bandwidth for J2K files in bits per second */ int _j2k_bandwidth; /** DCI naming stuff */ @@ -289,13 +311,12 @@ private: */ bool _three_d; bool _sequence_video; + bool _interop; + libdcp::Key _key; /** true if our state has changed since we last saved it */ mutable bool _dirty; - /** Mutex for all state except _directory */ - mutable boost::mutex _state_mutex; - friend class paths_test; friend class film_metadata_test; };