projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split up Config::read().
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 9c3650f8d00af1d8cfb0f6f2b2ad1cf33136942a..96016d75b8870ead42d58e9ad96a35a532f21b9e 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-174,6
+174,10
@@
public:
return _allow_96khz_audio;
}
return _allow_96khz_audio;
}
+ bool use_all_audio_channels () const {
+ return _use_all_audio_channels;
+ }
+
bool show_experimental_audio_processors () const {
return _show_experimental_audio_processors;
}
bool show_experimental_audio_processors () const {
return _show_experimental_audio_processors;
}
@@
-582,6
+586,10
@@
public:
return _auto_crop_threshold;
}
return _auto_crop_threshold;
}
+ boost::optional<std::string> last_release_notes_version () const {
+ return _last_release_notes_version;
+ }
+
/* SET (mostly) */
void set_master_encoding_threads (int n) {
/* SET (mostly) */
void set_master_encoding_threads (int n) {
@@
-669,6
+677,10
@@
public:
maybe_set (_allow_96khz_audio, a);
}
maybe_set (_allow_96khz_audio, a);
}
+ void set_use_all_audio_channels (bool a) {
+ maybe_set (_use_all_audio_channels, a);
+ }
+
void set_show_experimental_audio_processors (bool e) {
maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS);
}
void set_show_experimental_audio_processors (bool e) {
maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS);
}
@@
-1114,6
+1126,14
@@
public:
maybe_set (_auto_crop_threshold, threshold, AUTO_CROP_THRESHOLD);
}
maybe_set (_auto_crop_threshold, threshold, AUTO_CROP_THRESHOLD);
}
+ void set_last_release_notes_version (std::string version) {
+ maybe_set (_last_release_notes_version, version);
+ }
+
+ void unset_last_release_notes_version() {
+ maybe_set(_last_release_notes_version, boost::optional<std::string>());
+ }
+
ExportConfig& export_config() {
return _export;
}
ExportConfig& export_config() {
return _export;
}
@@
-1184,6
+1204,9
@@
public:
private:
Config ();
void read () override;
private:
Config ();
void read () override;
+ void read_config();
+ void read_cinemas();
+ void read_dkdm_recipients();
void set_defaults ();
void set_kdm_email_to_default ();
void set_notification_email_to_default ();
void set_defaults ();
void set_kdm_email_to_default ();
void set_notification_email_to_default ();
@@
-1230,6
+1253,7
@@
private:
*/
bool _allow_any_container;
bool _allow_96khz_audio;
*/
bool _allow_any_container;
bool _allow_96khz_audio;
+ bool _use_all_audio_channels;
/** Offer the upmixers in the audio processor settings */
bool _show_experimental_audio_processors;
boost::optional<std::string> _language;
/** Offer the upmixers in the audio processor settings */
bool _show_experimental_audio_processors;
boost::optional<std::string> _language;
@@
-1340,6
+1364,7
@@
private:
dcp::Formulation _default_kdm_type;
RoughDuration _default_kdm_duration;
double _auto_crop_threshold;
dcp::Formulation _default_kdm_type;
RoughDuration _default_kdm_duration;
double _auto_crop_threshold;
+ boost::optional<std::string> _last_release_notes_version;
ExportConfig _export;
ExportConfig _export;