diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-14 23:17:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-14 23:28:26 +0000 |
| commit | 71a358ce70bf9156e895f3dc6515e65628950422 (patch) | |
| tree | 77d8bbe95320e099e733945cdd19ac4a638543ba /src/lib | |
| parent | 85d72a25071f7b5a5d93a2d91f245b0cc7ffbe3b (diff) | |
Adapt for changes to disable_forensic variable types in libdcp.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 14 | ||||
| -rw-r--r-- | src/lib/film.h | 8 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 23c83d037..332353b71 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1205,6 +1205,9 @@ Film::frame_size () const * @param from KDM from time expressed as a local time with an offset from UTC. * @param until KDM to time expressed as a local time with an offset from UTC. * @param formulation KDM formulation to use. + * @param disable_forensic_marking_picture true to disable forensic marking of picture. + * @param disable_forensic_marking_audio if not set, don't disable forensic marking of audio. If set to 0, + * disable all forensic marking; if set above 0, disable forensic marking above that channel. */ dcp::EncryptedKDM Film::make_kdm ( @@ -1214,8 +1217,8 @@ Film::make_kdm ( dcp::LocalTime from, dcp::LocalTime until, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio + bool disable_forensic_marking_picture, + optional<int> disable_forensic_marking_audio ) const { if (!_encrypted) { @@ -1274,6 +1277,9 @@ Film::make_kdm ( * @param from KDM from time expressed as a local time in the time zone of the Screen's Cinema. * @param until KDM to time expressed as a local time in the time zone of the Screen's Cinema. * @param formulation KDM formulation to use. + * @param disable_forensic_marking_picture true to disable forensic marking of picture. + * @param disable_forensic_marking_audio if not set, don't disable forensic marking of audio. If set to 0, + * disable all forensic marking; if set above 0, disable forensic marking above that channel. */ list<ScreenKDM> Film::make_kdms ( @@ -1282,8 +1288,8 @@ Film::make_kdms ( boost::posix_time::ptime from, boost::posix_time::ptime until, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio + bool disable_forensic_marking_picture, + optional<int> disable_forensic_marking_audio ) const { list<ScreenKDM> kdms; diff --git a/src/lib/film.h b/src/lib/film.h index 67bcfbbdf..355a41da5 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -131,8 +131,8 @@ public: dcp::LocalTime from, dcp::LocalTime until, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio + bool disable_forensic_marking_picture, + boost::optional<int> disable_forensic_marking_audio ) const; std::list<ScreenKDM> make_kdms ( @@ -141,8 +141,8 @@ public: boost::posix_time::ptime from, boost::posix_time::ptime until, dcp::Formulation formulation, - int disable_forensic_marking_picture, - int disable_forensic_marking_audio + bool disable_forensic_marking_picture, + boost::optional<int> disable_forensic_marking_audio ) const; int state_version () const { |