projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a load of explicit keywords.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 9f473d7110b914866e21e443b2b9918eb90b44d8..20a1e2ca6551ad9f7c6ddaf9ddb4e2409e51c453 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.
@@
-67,7
+67,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;
@@
-96,6
+96,8
@@
public:
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;
@@
-120,6
+122,7
@@
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,
@@
-127,7
+130,9
@@
public:
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 (
@@
-135,7
+140,9
@@
public:
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 {
@@
-162,7
+169,8
@@
public:
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.
@@
-290,7
+298,7
@@
public:
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_use_isdcf_name (bool);
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);
@@
-333,9
+341,11
@@
private:
void playlist_changed ();
void playlist_order_changed ();
void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
void playlist_changed ();
void playlist_order_changed ();
void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
- void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
+ 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;