projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment tweak.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 6b1f3fb874e16cb13d858e4fa3302ed8bb256733..1ffcfdb9881831f90de4e98d5f3c7c4196c87eba 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-151,6
+152,10
@@
public:
return _default_dcp_content_type;
}
return _default_dcp_content_type;
}
+ int default_dcp_audio_channels () const {
+ return _default_dcp_audio_channels;
+ }
+
std::string dcp_issuer () const {
return _dcp_issuer;
}
std::string dcp_issuer () const {
return _dcp_issuer;
}
@@
-195,7
+200,7
@@
public:
return _kdm_from;
}
return _kdm_from;
}
- std::
string
kdm_cc () const {
+ std::
vector<std::string>
kdm_cc () const {
return _kdm_cc;
}
return _kdm_cc;
}
@@
-231,6
+236,10
@@
public:
return _log_types;
}
return _log_types;
}
+ bool analyse_ebur128 () const {
+ return _analyse_ebur128;
+ }
+
bool automatic_audio_analysis () const {
return _automatic_audio_analysis;
}
bool automatic_audio_analysis () const {
return _automatic_audio_analysis;
}
@@
-249,6
+258,10
@@
public:
return _dkdms;
}
return _dkdms;
}
+ boost::filesystem::path cinemas_file () const {
+ return _cinemas_file;
+ }
+
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
maybe_set (_num_local_encoding_threads, n);
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
maybe_set (_num_local_encoding_threads, n);
@@
-342,6
+355,10
@@
public:
maybe_set (_default_dcp_content_type, t);
}
maybe_set (_default_dcp_content_type, t);
}
+ void set_default_dcp_audio_channels (int c) {
+ maybe_set (_default_dcp_audio_channels, c);
+ }
+
void set_dcp_issuer (std::string i) {
maybe_set (_dcp_issuer, i);
}
void set_dcp_issuer (std::string i) {
maybe_set (_dcp_issuer, i);
}
@@
-386,7
+403,7
@@
public:
maybe_set (_kdm_from, f);
}
maybe_set (_kdm_from, f);
}
- void set_kdm_cc (std::
string
f) {
+ void set_kdm_cc (std::
vector<std::string>
f) {
maybe_set (_kdm_cc, f);
}
maybe_set (_kdm_cc, f);
}
@@
-427,6
+444,10
@@
public:
maybe_set (_log_types, t);
}
maybe_set (_log_types, t);
}
+ void set_analyse_ebur128 (bool a) {
+ maybe_set (_analyse_ebur128, a);
+ }
+
void set_automatic_audio_analysis (bool a) {
maybe_set (_automatic_audio_analysis, a);
}
void set_automatic_audio_analysis (bool a) {
maybe_set (_automatic_audio_analysis, a);
}
@@
-443,6
+464,8
@@
public:
changed ();
}
changed ();
}
+ void set_cinemas_file (boost::filesystem::path file);
+
void clear_history () {
_history.clear ();
changed ();
void clear_history () {
_history.clear ();
changed ();
@@
-458,14
+481,17
@@
public:
static Config* instance ();
static void drop ();
static void restore_defaults ();
static Config* instance ();
static void drop ();
static void restore_defaults ();
- static bool have_existing ();
+ static bool have_existing (
std::string
);
private:
Config ();
private:
Config ();
- static boost::filesystem::path
file (
bool create_directories = true);
+ static boost::filesystem::path
path (std::string file,
bool create_directories = true);
void read ();
void set_defaults ();
void set_kdm_email_to_default ();
void read ();
void set_defaults ();
void set_kdm_email_to_default ();
+ void write_config_xml () const;
+ void write_cinemas_xml () const;
+ void read_cinemas (cxml::Document const & f);
boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
template <class T>
boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
template <class T>
@@
-511,6
+537,7
@@
private:
int _default_still_length;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
int _default_still_length;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
+ int _default_dcp_audio_channels;
std::string _dcp_issuer;
std::string _dcp_creator;
int _default_j2k_bandwidth;
std::string _dcp_issuer;
std::string _dcp_creator;
int _default_j2k_bandwidth;
@@
-523,7
+550,7
@@
private:
std::string _mail_password;
std::string _kdm_subject;
std::string _kdm_from;
std::string _mail_password;
std::string _kdm_subject;
std::string _kdm_from;
- std::
string
_kdm_cc;
+ std::
vector<std::string>
_kdm_cc;
std::string _kdm_bcc;
std::string _kdm_email;
boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
std::string _kdm_bcc;
std::string _kdm_email;
boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
@@
-537,12
+564,14
@@
private:
/** maximum allowed J2K bandwidth in bits per second */
int _maximum_j2k_bandwidth;
int _log_types;
/** maximum allowed J2K bandwidth in bits per second */
int _maximum_j2k_bandwidth;
int _log_types;
+ bool _analyse_ebur128;
bool _automatic_audio_analysis;
#ifdef DCPOMATIC_WINDOWS
bool _win32_console;
#endif
std::vector<boost::filesystem::path> _history;
std::vector<dcp::EncryptedKDM> _dkdms;
bool _automatic_audio_analysis;
#ifdef DCPOMATIC_WINDOWS
bool _win32_console;
#endif
std::vector<boost::filesystem::path> _history;
std::vector<dcp::EncryptedKDM> _dkdms;
+ boost::filesystem::path _cinemas_file;
/** Singleton instance, or 0 */
static Config* _instance;
/** Singleton instance, or 0 */
static Config* _instance;