projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic implementation of a tree view for DKDMs (#1012).
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index fc6315242b21d084ccdf94c696dbb039296d648e..44708a24fc231b561dcebe0efb84e2ade175fb9d 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-40,6
+40,7
@@
class DCPContentType;
class Ratio;
class Cinema;
class Film;
class Ratio;
class Cinema;
class Film;
+class DKDMGroup;
/** @class Config
* @brief A singleton class holding configuration.
/** @class Config
* @brief A singleton class holding configuration.
@@
-163,6
+164,10
@@
public:
return _default_container;
}
return _default_container;
}
+ Ratio const * default_scale_to () const {
+ return _default_scale_to;
+ }
+
DCPContentType const * default_dcp_content_type () const {
return _default_dcp_content_type;
}
DCPContentType const * default_dcp_content_type () const {
return _default_dcp_content_type;
}
@@
-277,7
+282,7
@@
public:
return _history;
}
return _history;
}
-
std::vector<dcp::EncryptedKDM
> dkdms () const {
+
boost::shared_ptr<DKDMGroup
> dkdms () const {
return _dkdms;
}
return _dkdms;
}
@@
-431,6
+436,10
@@
public:
maybe_set (_default_container, c);
}
maybe_set (_default_container, c);
}
+ void set_default_scale_to (Ratio const * c) {
+ maybe_set (_default_scale_to, c);
+ }
+
void set_default_dcp_content_type (DCPContentType const * t) {
maybe_set (_default_dcp_content_type, t);
}
void set_default_dcp_content_type (DCPContentType const * t) {
maybe_set (_default_dcp_content_type, t);
}
@@
-538,7
+547,7
@@
public:
}
#endif
}
#endif
- void set_dkdms (
std::vector<dcp::EncryptedKDM
> dkdms) {
+ void set_dkdms (
boost::shared_ptr<DKDMGroup
> dkdms) {
_dkdms = dkdms;
changed ();
}
_dkdms = dkdms;
changed ();
}
@@
-697,6
+706,7
@@
private:
/** Default length of still image content (seconds) */
int _default_still_length;
Ratio const * _default_container;
/** Default length of still image content (seconds) */
int _default_still_length;
Ratio const * _default_container;
+ Ratio const * _default_scale_to;
DCPContentType const * _default_dcp_content_type;
int _default_dcp_audio_channels;
std::string _dcp_issuer;
DCPContentType const * _default_dcp_content_type;
int _default_dcp_audio_channels;
std::string _dcp_issuer;
@@
-735,7
+745,7
@@
private:
bool _win32_console;
#endif
std::vector<boost::filesystem::path> _history;
bool _win32_console;
#endif
std::vector<boost::filesystem::path> _history;
-
std::vector<dcp::EncryptedKDM
> _dkdms;
+
boost::shared_ptr<DKDMGroup
> _dkdms;
boost::filesystem::path _cinemas_file;
bool _show_hints_before_make_dcp;
bool _confirm_kdm_email;
boost::filesystem::path _cinemas_file;
bool _show_hints_before_make_dcp;
bool _confirm_kdm_email;