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 2.0
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 14cd640eeeefb2a042086dd600b447626103f044..66ff662142133b6e4258b49c745b93759430252f 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-29,14
+29,13
@@
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <dcp/metadata.h>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <dcp/metadata.h>
-#include "
dci
_metadata.h"
+#include "
isdcf
_metadata.h"
#include "colour_conversion.h"
#include "colour_conversion.h"
-#include "server.h"
class ServerDescription;
class Scaler;
class Filter;
class ServerDescription;
class Scaler;
class Filter;
-class SoundProcessor;
+class
Cinema
SoundProcessor;
class DCPContentType;
class Ratio;
class Cinema;
class DCPContentType;
class Ratio;
class Cinema;
@@
-66,6
+65,7
@@
public:
void set_use_any_servers (bool u) {
_use_any_servers = u;
void set_use_any_servers (bool u) {
_use_any_servers = u;
+ changed ();
}
bool use_any_servers () const {
}
bool use_any_servers () const {
@@
-75,6
+75,7
@@
public:
/** @param s New list of servers */
void set_servers (std::vector<std::string> s) {
_servers = s;
/** @param s New list of servers */
void set_servers (std::vector<std::string> s) {
_servers = s;
+ changed ();
}
/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
}
/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
@@
-87,7
+88,7
@@
public:
return _tms_ip;
}
return _tms_ip;
}
- /** @return The path on a TMS that we should
write
DCPs to */
+ /** @return The path on a TMS that we should
changed
DCPs to */
std::string tms_path () const {
return _tms_path;
}
std::string tms_path () const {
return _tms_path;
}
@@
-102,9
+103,9
@@
public:
return _tms_password;
}
return _tms_password;
}
- /** @return The sound processor that we are using */
-
SoundProcessor const *
sound_processor () const {
- return _sound_processor;
+ /** @return The
cinema
sound processor that we are using */
+
CinemaSoundProcessor const * cinema_
sound_processor () const {
+ return _
cinema_
sound_processor;
}
std::list<boost::shared_ptr<Cinema> > cinemas () const {
}
std::list<boost::shared_ptr<Cinema> > cinemas () const {
@@
-114,9
+115,13
@@
public:
std::list<int> allowed_dcp_frame_rates () const {
return _allowed_dcp_frame_rates;
}
std::list<int> allowed_dcp_frame_rates () const {
return _allowed_dcp_frame_rates;
}
+
+ bool allow_any_dcp_frame_rate () const {
+ return _allow_any_dcp_frame_rate;
+ }
-
DCIMetadata default_dci
_metadata () const {
- return _default_
dci
_metadata;
+
ISDCFMetadata default_isdcf
_metadata () const {
+ return _default_
isdcf
_metadata;
}
boost::optional<std::string> language () const {
}
boost::optional<std::string> language () const {
@@
-163,10
+168,18
@@
public:
return _mail_password;
}
return _mail_password;
}
+ std::string kdm_subject () const {
+ return _kdm_subject;
+ }
+
std::string kdm_from () const {
return _kdm_from;
}
std::string kdm_from () const {
return _kdm_from;
}
+ std::string kdm_cc () const {
+ return _kdm_cc;
+ }
+
std::string kdm_email () const {
return _kdm_email;
}
std::string kdm_email () const {
return _kdm_email;
}
@@
-178,125
+191,188
@@
public:
bool check_for_test_updates () const {
return _check_for_test_updates;
}
bool check_for_test_updates () const {
return _check_for_test_updates;
}
+
+ int maximum_j2k_bandwidth () const {
+ return _maximum_j2k_bandwidth;
+ }
+
+ int log_types () const {
+ return _log_types;
+ }
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
_num_local_encoding_threads = n;
/** @param n New number of local encoding threads */
void set_num_local_encoding_threads (int n) {
_num_local_encoding_threads = n;
+ changed ();
}
void set_default_directory (boost::filesystem::path d) {
_default_directory = d;
}
void set_default_directory (boost::filesystem::path d) {
_default_directory = d;
+ changed ();
}
/** @param p New server port */
void set_server_port_base (int p) {
_server_port_base = p;
}
/** @param p New server port */
void set_server_port_base (int p) {
_server_port_base = p;
+ changed ();
}
/** @param i IP address of a TMS that we can copy DCPs to */
void set_tms_ip (std::string i) {
_tms_ip = i;
}
/** @param i IP address of a TMS that we can copy DCPs to */
void set_tms_ip (std::string i) {
_tms_ip = i;
+ changed ();
}
}
- /** @param p Path on a TMS that we should
write
DCPs to */
+ /** @param p Path on a TMS that we should
changed
DCPs to */
void set_tms_path (std::string p) {
_tms_path = p;
void set_tms_path (std::string p) {
_tms_path = p;
+ changed ();
}
/** @param u User name to log into the TMS with */
void set_tms_user (std::string u) {
_tms_user = u;
}
/** @param u User name to log into the TMS with */
void set_tms_user (std::string u) {
_tms_user = u;
+ changed ();
}
/** @param p Password to log into the TMS with */
void set_tms_password (std::string p) {
_tms_password = p;
}
/** @param p Password to log into the TMS with */
void set_tms_password (std::string p) {
_tms_password = p;
+ changed ();
}
void add_cinema (boost::shared_ptr<Cinema> c) {
_cinemas.push_back (c);
}
void add_cinema (boost::shared_ptr<Cinema> c) {
_cinemas.push_back (c);
+ changed ();
}
void remove_cinema (boost::shared_ptr<Cinema> c) {
_cinemas.remove (c);
}
void remove_cinema (boost::shared_ptr<Cinema> c) {
_cinemas.remove (c);
+ changed ();
}
void set_allowed_dcp_frame_rates (std::list<int> const & r) {
_allowed_dcp_frame_rates = r;
}
void set_allowed_dcp_frame_rates (std::list<int> const & r) {
_allowed_dcp_frame_rates = r;
+ changed ();
}
}
- void set_default_dci_metadata (DCIMetadata d) {
- _default_dci_metadata = d;
+ void set_allow_any_dcp_frame_rate (bool a) {
+ _allow_any_dcp_frame_rate = a;
+ changed ();
+ }
+
+ void set_default_isdcf_metadata (ISDCFMetadata d) {
+ _default_isdcf_metadata = d;
+ changed ();
}
void set_language (std::string l) {
_language = l;
}
void set_language (std::string l) {
_language = l;
+ changed ();
}
void unset_language () {
_language = boost::none;
}
void unset_language () {
_language = boost::none;
+ changed ();
}
void set_default_still_length (int s) {
_default_still_length = s;
}
void set_default_still_length (int s) {
_default_still_length = s;
+ changed ();
}
void set_default_container (Ratio const * c) {
_default_container = c;
}
void set_default_container (Ratio const * c) {
_default_container = c;
+ changed ();
}
void set_default_dcp_content_type (DCPContentType const * t) {
_default_dcp_content_type = t;
}
void set_default_dcp_content_type (DCPContentType const * t) {
_default_dcp_content_type = t;
+ changed ();
}
void set_dcp_metadata (dcp::XMLMetadata m) {
_dcp_metadata = m;
}
void set_dcp_metadata (dcp::XMLMetadata m) {
_dcp_metadata = m;
+ changed ();
}
void set_default_j2k_bandwidth (int b) {
_default_j2k_bandwidth = b;
}
void set_default_j2k_bandwidth (int b) {
_default_j2k_bandwidth = b;
+ changed ();
}
void set_default_audio_delay (int d) {
_default_audio_delay = d;
}
void set_default_audio_delay (int d) {
_default_audio_delay = d;
+ changed ();
}
void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
_colour_conversions = c;
}
void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
_colour_conversions = c;
+ changed ();
}
void set_mail_server (std::string s) {
_mail_server = s;
}
void set_mail_server (std::string s) {
_mail_server = s;
+ changed ();
}
void set_mail_user (std::string u) {
_mail_user = u;
}
void set_mail_user (std::string u) {
_mail_user = u;
+ changed ();
}
void set_mail_password (std::string p) {
_mail_password = p;
}
void set_mail_password (std::string p) {
_mail_password = p;
+ changed ();
+ }
+
+ void set_kdm_subject (std::string s) {
+ _kdm_subject = s;
+ changed ();
}
void set_kdm_from (std::string f) {
_kdm_from = f;
}
void set_kdm_from (std::string f) {
_kdm_from = f;
+ changed ();
}
}
+ void set_kdm_cc (std::string f) {
+ _kdm_cc = f;
+ changed ();
+ }
+
void set_kdm_email (std::string e) {
_kdm_email = e;
void set_kdm_email (std::string e) {
_kdm_email = e;
+ changed ();
}
}
+ void reset_kdm_email ();
+
void set_check_for_updates (bool c) {
_check_for_updates = c;
void set_check_for_updates (bool c) {
_check_for_updates = c;
+ changed ();
}
void set_check_for_test_updates (bool c) {
_check_for_test_updates = c;
}
void set_check_for_test_updates (bool c) {
_check_for_test_updates = c;
+ changed ();
}
}
-
- void write () const;
+ void set_maximum_j2k_bandwidth (int b) {
+ _maximum_j2k_bandwidth = b;
+ changed ();
+ }
+
+ void set_log_types (int t) {
+ _log_types = t;
+ changed ();
+ }
+
boost::filesystem::path signer_chain_directory () const;
boost::filesystem::path signer_chain_directory () const;
+ void changed ();
+ boost::signals2::signal<void ()> Changed;
+
static Config* instance ();
static void drop ();
static Config* instance ();
static void drop ();
@@
-304,7
+380,7
@@
private:
Config ();
boost::filesystem::path file (bool) const;
void read ();
Config ();
boost::filesystem::path file (bool) const;
void read ();
- void
read_old_metadata ()
;
+ void
write () const
;
/** number of threads to use for J2K encoding on the local machine */
int _num_local_encoding_threads;
/** number of threads to use for J2K encoding on the local machine */
int _num_local_encoding_threads;
@@
-326,11
+402,13
@@
private:
std::string _tms_user;
/** Password to log into the TMS with */
std::string _tms_password;
std::string _tms_user;
/** Password to log into the TMS with */
std::string _tms_password;
- /** Our sound processor */
-
SoundProcessor const *
_sound_processor;
+ /** Our
cinema
sound processor */
+
CinemaSoundProcessor const * _cinema
_sound_processor;
std::list<int> _allowed_dcp_frame_rates;
std::list<int> _allowed_dcp_frame_rates;
- /** Default DCI metadata for newly-created Films */
- DCIMetadata _default_dci_metadata;
+ /** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
+ bool _allow_any_dcp_frame_rate;
+ /** Default ISDCF metadata for newly-created Films */
+ ISDCFMetadata _default_isdcf_metadata;
boost::optional<std::string> _language;
int _default_still_length;
Ratio const * _default_container;
boost::optional<std::string> _language;
int _default_still_length;
Ratio const * _default_container;
@@
-343,11
+421,16
@@
private:
std::string _mail_server;
std::string _mail_user;
std::string _mail_password;
std::string _mail_server;
std::string _mail_user;
std::string _mail_password;
+ std::string _kdm_subject;
std::string _kdm_from;
std::string _kdm_from;
+ std::string _kdm_cc;
std::string _kdm_email;
/** true to check for updates on startup */
bool _check_for_updates;
bool _check_for_test_updates;
std::string _kdm_email;
/** true to check for updates on startup */
bool _check_for_updates;
bool _check_for_test_updates;
+ /** maximum allowed J2K bandwidth in bits per second */
+ int _maximum_j2k_bandwidth;
+ int _log_types;
/** Singleton instance, or 0 */
static Config* _instance;
/** Singleton instance, or 0 */
static Config* _instance;