projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 1.0
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 66ff662142133b6e4258b49c745b93759430252f..03dd9c0feb68ac050bd9f0efa5e59b3b295e3974 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-132,6
+132,10
@@
public:
return _default_still_length;
}
return _default_still_length;
}
+ Ratio const * default_scale () const {
+ return _default_scale;
+ }
+
Ratio const * default_container () const {
return _default_container;
}
Ratio const * default_container () const {
return _default_container;
}
@@
-281,6
+285,11
@@
public:
changed ();
}
changed ();
}
+ void set_default_scale (Ratio const * s) {
+ _default_scale = s;
+ changed ();
+ }
+
void set_default_container (Ratio const * c) {
_default_container = c;
changed ();
void set_default_container (Ratio const * c) {
_default_container = c;
changed ();
@@
-411,6
+420,7
@@
private:
ISDCFMetadata _default_isdcf_metadata;
boost::optional<std::string> _language;
int _default_still_length;
ISDCFMetadata _default_isdcf_metadata;
boost::optional<std::string> _language;
int _default_still_length;
+ Ratio const * _default_scale;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
dcp::XMLMetadata _dcp_metadata;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
dcp::XMLMetadata _dcp_metadata;