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 0aa3dab3f05a7388b7c0a6f02062321b366b956f..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;
@@
-130,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 (
@@
-138,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 {
@@
-165,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.