From e7bc3bd16456c17bc6fe1d7981040b14e820505e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 10 Jun 2014 15:33:26 +0100 Subject: Use ISDCF rather than DCI when talking about the digital cinema naming convention (#362). Reported-by: Mattias Mattsson --- src/lib/config.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/config.h') diff --git a/src/lib/config.h b/src/lib/config.h index bd8cfe297..671f53ef3 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -29,7 +29,7 @@ #include #include #include -#include "dci_metadata.h" +#include "isdcf_metadata.h" #include "colour_conversion.h" #include "server.h" @@ -121,8 +121,8 @@ public: return _allow_any_dcp_frame_rate; } - DCIMetadata default_dci_metadata () const { - return _default_dci_metadata; + ISDCFMetadata default_isdcf_metadata () const { + return _default_isdcf_metadata; } boost::optional language () const { @@ -254,8 +254,8 @@ public: changed (); } - void set_default_dci_metadata (DCIMetadata d) { - _default_dci_metadata = d; + void set_default_isdcf_metadata (ISDCFMetadata d) { + _default_isdcf_metadata = d; changed (); } @@ -389,8 +389,8 @@ private: std::list _allowed_dcp_frame_rates; /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */ bool _allow_any_dcp_frame_rate; - /** Default DCI metadata for newly-created Films */ - DCIMetadata _default_dci_metadata; + /** Default ISDCF metadata for newly-created Films */ + ISDCFMetadata _default_isdcf_metadata; boost::optional _language; int _default_still_length; Ratio const * _default_container; -- cgit v1.2.3