projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check consistency of refer-to-DCP settings after adding content (#1456).
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index ad94852a2486e9757a888d205a70a33ee7e9f735..b77ce7a7651099dfd4334381002613b824207af4 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-31,6
+31,7
@@
#include "isdcf_metadata.h"
#include "frame_rate_change.h"
#include "signaller.h"
#include "isdcf_metadata.h"
#include "frame_rate_change.h"
#include "signaller.h"
+#include "dcp_text_track.h"
#include <dcp/key.h>
#include <dcp/encrypted_kdm.h>
#include <boost/signals2.hpp>
#include <dcp/key.h>
#include <dcp/encrypted_kdm.h>
#include <boost/signals2.hpp>
@@
-47,7
+48,6
@@
namespace xmlpp {
class DCPContentType;
class Log;
class Content;
class DCPContentType;
class Log;
class Content;
-class Player;
class Playlist;
class AudioContent;
class Screen;
class Playlist;
class AudioContent;
class Screen;
@@
-68,7
+68,7
@@
struct isdcf_name_test;
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
- Film (boost::optional<boost::filesystem::path> dir);
+
explicit
Film (boost::optional<boost::filesystem::path> dir);
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
@@
-89,14
+89,17
@@
public:
}
boost::filesystem::path file (boost::filesystem::path f) const;
}
boost::filesystem::path file (boost::filesystem::path f) const;
- boost::filesystem::path dir (boost::filesystem::path d) const;
+ boost::filesystem::path dir (boost::filesystem::path d
, bool create = true
) const;
void use_template (std::string name);
std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
void write_metadata () const;
void use_template (std::string name);
std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
void write_metadata () const;
+ void write_metadata (boost::filesystem::path path) const;
void write_template (boost::filesystem::path path) const;
boost::shared_ptr<xmlpp::Document> metadata (bool with_content_paths = true) const;
void write_template (boost::filesystem::path path) const;
boost::shared_ptr<xmlpp::Document> metadata (bool with_content_paths = true) const;
+ void copy_from (boost::shared_ptr<const Film> film);
+
std::string isdcf_name (bool if_created_now) const;
std::string dcp_name (bool if_created_now = false) const;
std::string isdcf_name (bool if_created_now) const;
std::string dcp_name (bool if_created_now = false) const;
@@
-112,6
+115,8
@@
public:
int audio_frame_rate () const;
int audio_frame_rate () const;
+ std::list<DCPTextTrack> closed_caption_tracks () const;
+
uint64_t required_disk_space () const;
bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
uint64_t required_disk_space () const;
bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
@@
-121,22
+126,27
@@
public:
DCPTime length () const;
int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
DCPTime length () const;
int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
+ std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
dcp::EncryptedKDM make_kdm (
dcp::Certificate recipient,
dcp::EncryptedKDM make_kdm (
dcp::Certificate recipient,
- std::vector<
dcp::Certificate
> trusted_devices,
+ std::vector<
std::string
> trusted_devices,
boost::filesystem::path cpl_file,
dcp::LocalTime from,
dcp::LocalTime until,
boost::filesystem::path cpl_file,
dcp::LocalTime from,
dcp::LocalTime until,
- dcp::Formulation formulation
+ dcp::Formulation formulation,
+ bool disable_forensic_marking_picture,
+ boost::optional<int> disable_forensic_marking_audio
) const;
std::list<ScreenKDM> make_kdms (
) const;
std::list<ScreenKDM> make_kdms (
- std::list<boost::shared_ptr<Screen> >,
+ std::list<boost::shared_ptr<Screen> >
screens
,
boost::filesystem::path cpl_file,
boost::posix_time::ptime from,
boost::posix_time::ptime until,
boost::filesystem::path cpl_file,
boost::posix_time::ptime from,
boost::posix_time::ptime until,
- dcp::Formulation formulation
+ dcp::Formulation formulation,
+ bool disable_forensic_marking_picture,
+ boost::optional<int> disable_forensic_marking_audio
) const;
int state_version () const {
) const;
int state_version () const {
@@
-145,11
+155,6
@@
public:
std::string subtitle_language () const;
std::string subtitle_language () const;
- void make_audio_mapping_default (
- AudioMapping & mapping,
- boost::optional<boost::filesystem::path> filename = boost::optional<boost::filesystem::path> ()
- ) const;
-
std::vector<std::string> audio_output_names () const;
void repeat_content (ContentList, int);
std::vector<std::string> audio_output_names () const;
void repeat_content (ContentList, int);
@@
-161,12
+166,10
@@
public:
std::list<DCPTimePeriod> reels () const;
std::list<int> mapped_audio_channels () const;
std::list<DCPTimePeriod> reels () const;
std::list<int> mapped_audio_channels () const;
- /** @param A period within the DCP
- * @return Name of the content which most contributes to the given period.
- */
std::string content_summary (DCPTimePeriod period) const;
std::string content_summary (DCPTimePeriod period) const;
- std::list<std::string> fix_conflicting_settings ();
+ bool references_dcp_video () const;
+ bool references_dcp_audio () const;
/** Identifiers for the parts of our state;
used for signalling changes.
/** Identifiers for the parts of our state;
used for signalling changes.
@@
-196,7
+199,8
@@
public:
AUDIO_PROCESSOR,
REEL_TYPE,
REEL_LENGTH,
AUDIO_PROCESSOR,
REEL_TYPE,
REEL_LENGTH,
- UPLOAD_AFTER_MAKE_DCP
+ UPLOAD_AFTER_MAKE_DCP,
+ REENCODE_J2K
};
};
@@
-284,12
+288,21
@@
public:
return _upload_after_make_dcp;
}
return _upload_after_make_dcp;
}
+ std::string context_id () const {
+ return _context_id;
+ }
+
+ bool reencode_j2k () const {
+ return _reencode_j2k;
+ }
+
+
/* SET */
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_use_isdcf_name (bool);
/* SET */
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_use_isdcf_name (bool);
- void examine_and_add_content (boost::shared_ptr<Content>);
+ void examine_and_add_content (boost::shared_ptr<Content>
content, bool disable_audio_analysis = false
);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
void remove_content (ContentList);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
void remove_content (ContentList);
@@
-303,7
+316,7
@@
public:
void set_key (dcp::Key key);
void set_j2k_bandwidth (int);
void set_isdcf_metadata (ISDCFMetadata);
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 ();
void set_audio_channels (int);
void set_three_d (bool);
void set_isdcf_date_today ();
@@
-313,12
+326,16
@@
public:
void set_reel_type (ReelType);
void set_reel_length (int64_t);
void set_upload_after_make_dcp (bool);
void set_reel_type (ReelType);
void set_reel_length (int64_t);
void set_upload_after_make_dcp (bool);
+ void set_reencode_j2k (bool);
- /** Emitted when some property has of the Film has changed */
- mutable boost::signals2::signal<void (
Property)> Changed
;
+ /** Emitted when some property has of the Film
is about to change or
has changed */
+ mutable boost::signals2::signal<void (
ChangeType, Property)> Change
;
/** Emitted when some property of our content has changed */
/** Emitted when some property of our content has changed */
- mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
+ mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
+
+ /** Emitted when we have something important to tell the user */
+ boost::signals2::signal<void (std::string)> Message;
/** Current version number of the state file */
static int const current_state_version;
/** Current version number of the state file */
static int const current_state_version;
@@
-326,15
+343,19
@@
public:
private:
friend struct ::isdcf_name_test;
private:
friend struct ::isdcf_name_test;
+ template <typename> friend class ChangeSignaller;
- void signal_changed (Property);
+ void signal_change (ChangeType, Property);
+ void signal_change (ChangeType, int);
std::string video_identifier () const;
std::string video_identifier () const;
- void playlist_change
d (
);
+ void playlist_change
(ChangeType
);
void playlist_order_changed ();
void playlist_order_changed ();
- void playlist_content_change
d (
boost::weak_ptr<Content>, int, bool frequent);
- void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
+ void playlist_content_change
(ChangeType type,
boost::weak_ptr<Content>, int, bool frequent);
+ void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>
, bool disable_audio_analysis
);
void audio_analysis_finished ();
void audio_analysis_finished ();
+ static std::string const metadata_file;
+
/** Log to write to */
boost::shared_ptr<Log> _log;
boost::shared_ptr<Playlist> _playlist;
/** Log to write to */
boost::shared_ptr<Log> _log;
boost::shared_ptr<Playlist> _playlist;
@@
-357,6
+378,10
@@
private:
bool _signed;
bool _encrypted;
dcp::Key _key;
bool _signed;
bool _encrypted;
dcp::Key _key;
+ /** context ID used when encrypting picture assets; we keep it so that we can
+ * re-start picture MXF encodes.
+ */
+ std::string _context_id;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** ISDCF naming stuff */
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** ISDCF naming stuff */
@@
-378,6
+403,9
@@
private:
/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
int64_t _reel_length;
bool _upload_after_make_dcp;
/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
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;
int _state_version;
int _state_version;
@@
-386,9
+414,10
@@
private:
/** film being used as a template, or 0 */
boost::shared_ptr<Film> _template_film;
/** film being used as a template, or 0 */
boost::shared_ptr<Film> _template_film;
- boost::signals2::scoped_connection _playlist_changed_connection;
+
+ boost::signals2::scoped_connection _playlist_change_connection;
boost::signals2::scoped_connection _playlist_order_changed_connection;
boost::signals2::scoped_connection _playlist_order_changed_connection;
- boost::signals2::scoped_connection _playlist_content_change
d
_connection;
+ boost::signals2::scoped_connection _playlist_content_change_connection;
std::list<boost::signals2::connection> _job_connections;
std::list<boost::signals2::connection> _audio_analysis_connections;
std::list<boost::signals2::connection> _job_connections;
std::list<boost::signals2::connection> _audio_analysis_connections;