diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-08 00:13:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-08 01:52:16 +0100 |
| commit | b74bc6135a6a690bf5674638a8bea56e5580fd08 (patch) | |
| tree | 0686281f3b6dc067093a841e30fe2193038f695e /src/lib | |
| parent | 09d5906f44907aab5afb41ce2da887550c0011a8 (diff) | |
Show hints before make DCP (#823).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 3 | ||||
| -rw-r--r-- | src/lib/config.h | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 891d832a2..91966eefb 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -106,6 +106,7 @@ Config::set_defaults () _win32_console = false; #endif _cinemas_file = path ("cinemas.xml"); + _show_hints_before_make_dcp = true; _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -297,6 +298,7 @@ Config::read () } _cinemas_file = f.optional_string_child("CinemasFile").get_value_or (path ("cinemas.xml").string ()); + _show_hints_before_make_dcp = f.optional_bool_child("ShowHintsBeforeMakeDCP").get_value_or (true); /* Replace any cinemas from config.xml with those from the configured file */ if (boost::filesystem::exists (_cinemas_file)) { @@ -449,6 +451,7 @@ Config::write_config_xml () const } root->add_child("CinemasFile")->add_child_text (_cinemas_file.string()); + root->add_child("ShowHintsBeforeMakeDCP")->add_child_text (_show_hints_before_make_dcp ? "1" : "0"); try { doc.write_to_file_formatted (path("config.xml").string ()); diff --git a/src/lib/config.h b/src/lib/config.h index 1ffcfdb98..feaac8390 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -262,6 +262,10 @@ public: return _cinemas_file; } + bool show_hints_before_make_dcp () const { + return _show_hints_before_make_dcp; + } + /** @param n New number of local encoding threads */ void set_num_local_encoding_threads (int n) { maybe_set (_num_local_encoding_threads, n); @@ -466,6 +470,10 @@ public: void set_cinemas_file (boost::filesystem::path file); + void set_show_hints_before_make_dcp (bool s) { + maybe_set (_show_hints_before_make_dcp, s); + } + void clear_history () { _history.clear (); changed (); @@ -572,6 +580,7 @@ private: std::vector<boost::filesystem::path> _history; std::vector<dcp::EncryptedKDM> _dkdms; boost::filesystem::path _cinemas_file; + bool _show_hints_before_make_dcp; /** Singleton instance, or 0 */ static Config* _instance; |
