projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master into direct-mxf.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 98cbf67e576b3da04bdb648496ce154bc1d81177..fed297ad00f91018029f3b51b214bbf3b46c3bfd 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-95,6
+95,10
@@
public:
return _sound_processor;
}
return _sound_processor;
}
+ std::list<int> allowed_dcp_frame_rates () const {
+ return _allowed_dcp_frame_rates;
+ }
+
DCIMetadata default_dci_metadata () const {
return _default_dci_metadata;
}
DCIMetadata default_dci_metadata () const {
return _default_dci_metadata;
}
@@
-146,6
+150,10
@@
public:
_tms_password = p;
}
_tms_password = p;
}
+ void set_allowed_dcp_frame_rates (std::list<int> const & r) {
+ _allowed_dcp_frame_rates = r;
+ }
+
void set_default_dci_metadata (DCIMetadata d) {
_default_dci_metadata = d;
}
void set_default_dci_metadata (DCIMetadata d) {
_default_dci_metadata = d;
}
@@
-181,6
+189,7
@@
private:
std::string _tms_password;
/** Our sound processor */
SoundProcessor const * _sound_processor;
std::string _tms_password;
/** Our sound processor */
SoundProcessor const * _sound_processor;
+ std::list<int> _allowed_dcp_frame_rates;
/** Default DCI metadata for newly-created Films */
DCIMetadata _default_dci_metadata;
/** Default DCI metadata for newly-created Films */
DCIMetadata _default_dci_metadata;