projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add operator* for Time and int.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index c6bf5986bc7626de1bbbf37aec4ec26755b9d645..2535bd82ae0d5ef3f34ca891b04c0f15623888d0 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-31,7
+31,6
@@
#include "export_config.h"
#include "rough_duration.h"
#include "state.h"
#include "export_config.h"
#include "rough_duration.h"
#include "state.h"
-#include "types.h"
#include <dcp/name_format.h>
#include <dcp/certificate_chain.h>
#include <dcp/encrypted_kdm.h>
#include <dcp/name_format.h>
#include <dcp/certificate_chain.h>
#include <dcp/encrypted_kdm.h>
@@
-242,6
+241,10
@@
public:
return _default_audio_language;
}
return _default_audio_language;
}
+ boost::optional<dcp::LanguageTag::RegionSubtag> default_territory() const {
+ return _default_territory;
+ }
+
std::map<std::string, std::string> default_metadata () const {
return _default_metadata;
}
std::map<std::string, std::string> default_metadata () const {
return _default_metadata;
}
@@
-774,6
+777,14
@@
public:
maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>());
}
maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>());
}
+ void set_default_territory(dcp::LanguageTag::RegionSubtag tag) {
+ maybe_set(_default_territory, tag);
+ }
+
+ void unset_default_territory() {
+ maybe_set(_default_territory, boost::optional<dcp::LanguageTag::RegionSubtag>());
+ }
+
void set_default_metadata (std::map<std::string, std::string> const& metadata) {
maybe_set (_default_metadata, metadata);
}
void set_default_metadata (std::map<std::string, std::string> const& metadata) {
maybe_set (_default_metadata, metadata);
}
@@
-1305,6
+1316,7
@@
private:
int _default_audio_delay;
bool _default_interop;
boost::optional<dcp::LanguageTag> _default_audio_language;
int _default_audio_delay;
bool _default_interop;
boost::optional<dcp::LanguageTag> _default_audio_language;
+ boost::optional<dcp::LanguageTag::RegionSubtag> _default_territory;
std::map<std::string, std::string> _default_metadata;
/** Default directory to offer to write KDMs to; if it's not set,
the home directory will be offered.
std::map<std::string, std::string> _default_metadata;
/** Default directory to offer to write KDMs to; if it's not set,
the home directory will be offered.