diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-27 11:55:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-27 11:55:27 +0200 |
| commit | 6e3e984162ca7a181bc7c98d90c295e88e4e7f6c (patch) | |
| tree | f514e6618e9012c307188a11a9d2a2ade2e04d19 /src/lib/config.h | |
| parent | a3d4dfb4357a265d4c3a4bfafe7d17a8ecc72f66 (diff) | |
| parent | 0771af91ad52ed2e25ab89410eb6e783b50f7329 (diff) | |
Merge branch 'own-config' into v2.15.x
This makes 2.15.x copy the 2.14.x configuration so you can run 2.14.x
again afterwards without recreating everything.
Diffstat (limited to 'src/lib/config.h')
| -rw-r--r-- | src/lib/config.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/config.h b/src/lib/config.h index 46bd390cc..c9206b139 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -827,8 +827,6 @@ public: void set_cinemas_file (boost::filesystem::path file); - void set_dkdm_recipients_file (boost::filesystem::path file); - void set_show_hints_before_make_dcp (bool s) { maybe_set (_show_hints_before_make_dcp, s); } @@ -1095,7 +1093,8 @@ public: void save_template (std::shared_ptr<const Film> film, std::string name) const; bool existing_template (std::string name) const; std::list<std::string> templates () const; - boost::filesystem::path template_path (std::string name) const; + boost::filesystem::path template_read_path (std::string name) const; + boost::filesystem::path template_write_path (std::string name) const; void rename_template (std::string old_name, std::string new_name) const; void delete_template (std::string name) const; @@ -1103,7 +1102,8 @@ public: static void drop (); static void restore_defaults (); static bool have_existing (std::string); - static boost::filesystem::path config_file (); + static boost::filesystem::path config_read_file (); + static boost::filesystem::path config_write_file (); private: Config (); |