diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-01-16 14:49:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-01-16 21:29:27 +0000 |
| commit | 0ca36c0d2b238a9e2165b5d113c22f144835a672 (patch) | |
| tree | 400af086099a1e1050577cb77c234e2ce83ac9e1 /src/lib | |
| parent | 1aad2c33896ce6222f3c929c7af7fe4ff5fda0f2 (diff) | |
Allow configuration of default value of upload-to-TMS button.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 5 | ||||
| -rw-r--r-- | src/lib/config.h | 11 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 983fb69d8..9106a9559 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -101,6 +101,7 @@ Config::set_defaults () _default_j2k_bandwidth = 100000000; _default_audio_delay = 0; _default_interop = true; + _default_upload_after_make_dcp = false; _mail_server = ""; _mail_port = 25; _mail_user = ""; @@ -263,6 +264,7 @@ try _dcp_issuer = f.string_child ("DCPIssuer"); } + _default_upload_after_make_dcp = f.optional_bool_child("DefaultUploadAfterMakeDCP").get_value_or (false); _dcp_creator = f.optional_string_child ("DCPCreator").get_value_or (""); if (version && version.get() >= 2) { @@ -539,6 +541,7 @@ Config::write_config () const root->add_child("DCPIssuer")->add_child_text (_dcp_issuer); /* [XML] DCPIssuer Creator text to write into CPL files. */ root->add_child("DCPCreator")->add_child_text (_dcp_creator); + root->add_child("DefaultUploadAfterMakeDCP")->add_child_text (_default_upload_after_make_dcp ? "1" : "0"); /* [XML] ISDCFMetadata Default ISDCF metadata to use for new films; child tags are <code><ContentVersion></code>, <code><AudioLanguage></code>, <code><SubtitleLanguage></code>, <code><Territory></code>, diff --git a/src/lib/config.h b/src/lib/config.h index 61d9c64e6..dae1924a8 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -196,6 +196,10 @@ public: return _default_interop; } + bool default_upload_after_make_dcp () { + return _default_upload_after_make_dcp; + } + void set_default_kdm_directory (boost::filesystem::path d) { if (_default_kdm_directory && _default_kdm_directory.get() == d) { return; @@ -487,6 +491,10 @@ public: maybe_set (_default_interop, i); } + void set_default_upload_after_make_dcp (bool u) { + maybe_set (_default_upload_after_make_dcp, u); + } + void set_mail_server (std::string s) { maybe_set (_mail_server, s); } @@ -753,6 +761,7 @@ private: the home directory will be offered. */ boost::optional<boost::filesystem::path> _default_kdm_directory; + bool _default_upload_after_make_dcp; std::list<boost::shared_ptr<Cinema> > _cinemas; std::string _mail_server; int _mail_port; diff --git a/src/lib/film.cc b/src/lib/film.cc index f57b6299d..361daa8b6 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -151,7 +151,7 @@ Film::Film (optional<boost::filesystem::path> dir) , _audio_processor (0) , _reel_type (REELTYPE_SINGLE) , _reel_length (2000000000) - , _upload_after_make_dcp (false) + , _upload_after_make_dcp (Config::instance()->default_upload_after_make_dcp()) , _state_version (current_state_version) , _dirty (false) { |