X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=60e85c5f362dc1bfa2c0d8983458c758290342ef;hb=8414829693900c3d6362a4f15d677bb7e1462c3e;hp=4c24e816bb80ed315c529bd897a1055f246ebb6c;hpb=1158dd504d0838b0c359b2cf1d63615c4ecb0a53;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 4c24e816b..60e85c5f3 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -75,6 +75,8 @@ public: CINEMAS, SOUND, SOUND_OUTPUT, + INTERFACE_COMPLEXITY, + PLAYER_DCP_DIRECTORY, OTHER }; @@ -148,6 +150,10 @@ public: return _allow_any_dcp_frame_rate; } + bool allow_any_container () const { + return _allow_any_container; + } + ISDCFMetadata default_isdcf_metadata () const { return _default_isdcf_metadata; } @@ -355,6 +361,8 @@ public: NAG_ENCRYPTED_METADATA, NAG_REMAKE_DECRYPTION_CHAIN, NAG_BAD_SIGNER_CHAIN, + /* Not really a nag but it's the same idea */ + NAG_INITIAL_SETUP, NAG_COUNT }; @@ -419,6 +427,69 @@ public: return _notification[n]; } + boost::optional barco_username () const { + return _barco_username; + } + + boost::optional barco_password () const { + return _barco_password; + } + + boost::optional christie_username () const { + return _christie_username; + } + + boost::optional christie_password () const { + return _christie_password; + } + + boost::optional gdc_username () const { + return _gdc_username; + } + + boost::optional gdc_password () const { + return _gdc_password; + } + + enum Interface { + INTERFACE_SIMPLE, + INTERFACE_FULL + }; + + Interface interface_complexity () const { + return _interface_complexity; + } + + enum PlayerMode { + PLAYER_MODE_WINDOW, + PLAYER_MODE_FULL, + PLAYER_MODE_DUAL + }; + + PlayerMode player_mode () const { + return _player_mode; + } + + int image_display () const { + return _image_display; + } + + bool respect_kdm_validity_periods () const { + return _respect_kdm_validity_periods; + } + + boost::optional player_log_file () const { + return _player_log_file; + } + + boost::optional player_dcp_directory () const { + return _player_dcp_directory; + } + + boost::optional player_kdm_directory () const { + return _player_kdm_directory; + } + /* SET (mostly) */ void set_master_encoding_threads (int n) { @@ -488,6 +559,10 @@ public: maybe_set (_allow_any_dcp_frame_rate, a); } + void set_allow_any_container (bool a) { + maybe_set (_allow_any_container, a); + } + void set_default_isdcf_metadata (ISDCFMetadata d) { maybe_set (_default_isdcf_metadata, d); } @@ -761,6 +836,106 @@ public: maybe_set (_notification[n], v); } + void set_barco_username (std::string u) { + maybe_set (_barco_username, u); + } + + void unset_barco_username () { + maybe_set (_barco_username, boost::optional()); + } + + void set_barco_password (std::string p) { + maybe_set (_barco_password, p); + } + + void unset_barco_password () { + maybe_set (_barco_password, boost::optional()); + } + + void set_christie_username (std::string u) { + maybe_set (_christie_username, u); + } + + void unset_christie_username () { + maybe_set (_christie_username, boost::optional()); + } + + void set_christie_password (std::string p) { + maybe_set (_christie_password, p); + } + + void unset_christie_password () { + maybe_set (_christie_password, boost::optional()); + } + + void set_gdc_username (std::string u) { + maybe_set (_gdc_username, u); + } + + void unset_gdc_username () { + maybe_set (_gdc_username, boost::optional()); + } + + void set_gdc_password (std::string p) { + maybe_set (_gdc_password, p); + } + + void unset_gdc_password () { + maybe_set (_gdc_password, boost::optional()); + } + + void set_interface_complexity (Interface i) { + maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY); + } + + void set_player_mode (PlayerMode m) { + maybe_set (_player_mode, m); + } + + void set_image_display (int n) { + maybe_set (_image_display, n); + } + + void set_respect_kdm_validity_periods (bool r) { + maybe_set (_respect_kdm_validity_periods, r); + } + + void set_player_log_file (boost::filesystem::path p) { + maybe_set (_player_log_file, p); + } + + void unset_player_log_file () { + if (!_player_log_file) { + return; + } + _player_log_file = boost::none; + changed (); + } + + void set_player_dcp_directory (boost::filesystem::path p) { + maybe_set (_player_dcp_directory, p, PLAYER_DCP_DIRECTORY); + } + + void unset_player_dcp_directory () { + if (!_player_dcp_directory) { + return; + } + _player_dcp_directory = boost::none; + changed (PLAYER_DCP_DIRECTORY); + } + + void set_player_kdm_directory (boost::filesystem::path p) { + maybe_set (_player_kdm_directory, p); + } + + void unset_player_kdm_directory () { + if (!_player_kdm_directory) { + return; + } + _player_kdm_directory = boost::none; + changed (); + } + void changed (Property p = OTHER); boost::signals2::signal Changed; /** Emitted if read() failed on an existing Config file. There is nothing @@ -857,6 +1032,11 @@ 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; + /** Allow any container ratio, not just the standard ones. GDC SX-2001 will not play Flat + DCPs at 25fps but will play 16:9, so this is very useful for some users. + https://www.dcpomatic.com/forum/viewtopic.php?f=2&t=1119&p=4468 + */ + bool _allow_any_container; /** Default ISDCF metadata for newly-created Films */ ISDCFMetadata _default_isdcf_metadata; boost::optional _language; @@ -931,6 +1111,23 @@ private: boost::optional _decode_reduction; bool _default_notify; bool _notification[NOTIFICATION_COUNT]; + boost::optional _barco_username; + boost::optional _barco_password; + boost::optional _christie_username; + boost::optional _christie_password; + boost::optional _gdc_username; + boost::optional _gdc_password; + Interface _interface_complexity; + PlayerMode _player_mode; + int _image_display; + bool _respect_kdm_validity_periods; + boost::optional _player_log_file; + /** A directory containing DCPs whose contents are presented to the user + in the dual-screen player mode. DCPs on the list can be loaded + for playback. + */ + boost::optional _player_dcp_directory; + boost::optional _player_kdm_directory; static int const _current_version;