/*
- 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
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
-#include "dci_metadata.h"
+#include <dcp/metadata.h>
+#include <dcp/certificates.h>
+#include <dcp/signer.h>
+#include "isdcf_metadata.h"
#include "colour_conversion.h"
-#include "server.h"
class ServerDescription;
class Scaler;
class Filter;
-class SoundProcessor;
+class CinemaSoundProcessor;
class DCPContentType;
class Ratio;
class Cinema;
return _server_port_base;
}
- /** @return J2K encoding servers to use */
- std::vector<ServerDescription> servers () const {
+ void set_use_any_servers (bool u) {
+ _use_any_servers = u;
+ changed ();
+ }
+
+ bool use_any_servers () const {
+ return _use_any_servers;
+ }
+
+ /** @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 */
+ std::vector<std::string> servers () const {
return _servers;
}
std::string tms_ip () const {
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;
}
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<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 {
return _default_still_length;
}
+ Ratio const * default_scale () const {
+ return _default_scale;
+ }
+
Ratio const * default_container () const {
return _default_container;
}
return _default_dcp_content_type;
}
- libdcp::XMLMetadata dcp_metadata () const {
+ dcp::XMLMetadata dcp_metadata () const {
return _dcp_metadata;
}
return _default_j2k_bandwidth;
}
+ int default_audio_delay () const {
+ return _default_audio_delay;
+ }
+
std::vector<PresetColourConversion> colour_conversions () const {
return _colour_conversions;
}
return _mail_server;
}
+ std::string mail_user () const {
+ return _mail_user;
+ }
+
+ std::string mail_password () const {
+ return _mail_password;
+ }
+
+ std::string kdm_subject () const {
+ return _kdm_subject;
+ }
+
std::string kdm_from () const {
return _kdm_from;
}
+ std::string kdm_cc () const {
+ return _kdm_cc;
+ }
+
+ std::string kdm_bcc () const {
+ return _kdm_bcc;
+ }
+
std::string kdm_email () const {
return _kdm_email;
}
+ boost::shared_ptr<const dcp::Signer> signer () const {
+ return _signer;
+ }
+
+ dcp::Certificate decryption_certificate () const {
+ return _decryption_certificate;
+ }
+
+ std::string decryption_private_key () const {
+ return _decryption_private_key;
+ }
+
+ bool check_for_updates () const {
+ return _check_for_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;
+ changed ();
}
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 s New list of servers */
- void set_servers (std::vector<ServerDescription> s) {
- _servers = s;
- }
-
- void set_reference_scaler (Scaler const * s) {
- _reference_scaler = s;
- }
-
- void set_reference_filters (std::vector<Filter const *> const & f) {
- _reference_filters = f;
+ changed ();
}
/** @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;
+ changed ();
}
/** @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;
+ changed ();
}
void add_cinema (boost::shared_ptr<Cinema> c) {
_cinemas.push_back (c);
+ changed ();
}
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;
+ 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;
+ changed ();
}
void unset_language () {
_language = boost::none;
+ changed ();
}
void set_default_still_length (int s) {
_default_still_length = s;
+ 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_dcp_content_type (DCPContentType const * t) {
_default_dcp_content_type = t;
+ changed ();
}
- void set_dcp_metadata (libdcp::XMLMetadata m) {
+ void set_dcp_metadata (dcp::XMLMetadata m) {
_dcp_metadata = m;
+ changed ();
}
void set_default_j2k_bandwidth (int b) {
_default_j2k_bandwidth = b;
+ changed ();
+ }
+
+ void set_default_audio_delay (int d) {
+ _default_audio_delay = d;
+ changed ();
}
void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
_colour_conversions = c;
+ changed ();
}
void set_mail_server (std::string s) {
_mail_server = s;
+ changed ();
+ }
+
+ void set_mail_user (std::string u) {
+ _mail_user = u;
+ changed ();
+ }
+
+ 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;
+ changed ();
}
+ void set_kdm_cc (std::string f) {
+ _kdm_cc = f;
+ changed ();
+ }
+
+ void set_kdm_bcc (std::string f) {
+ _kdm_bcc = f;
+ changed ();
+ }
+
void set_kdm_email (std::string e) {
_kdm_email = e;
+ changed ();
+ }
+
+ void reset_kdm_email ();
+
+ void set_signer (boost::shared_ptr<const dcp::Signer> s) {
+ _signer = s;
+ changed ();
+ }
+
+ void set_decryption_certificate (dcp::Certificate c) {
+ _decryption_certificate = c;
+ changed ();
+ }
+
+ void set_decryption_private_key (std::string k) {
+ _decryption_private_key = k;
+ changed ();
}
-
- void write () const;
- boost::filesystem::path signer_chain_directory () const;
+ 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;
+ changed ();
+ }
+
+ void set_maximum_j2k_bandwidth (int b) {
+ _maximum_j2k_bandwidth = b;
+ changed ();
+ }
+
+ void set_log_types (int t) {
+ _log_types = t;
+ changed ();
+ }
+
+ void changed ();
+ boost::signals2::signal<void ()> Changed;
static Config* instance ();
static void drop ();
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;
* this port and the one above it will be used.
*/
int _server_port_base;
-
- /** J2K encoding servers to use */
- std::vector<ServerDescription> _servers;
- /** Scaler to use for the "A" part of A/B comparisons */
- Scaler const * _reference_scaler;
- /** Filters to use for the "A" part of A/B comparisons */
- std::vector<Filter const *> _reference_filters;
+ /** true to broadcast on the `any' address to look for servers */
+ bool _use_any_servers;
+ /** J2K encoding servers that should definitely be used */
+ std::vector<std::string> _servers;
/** The IP address of a TMS that we can copy DCPs to */
std::string _tms_ip;
/** The path on a TMS that we should write DCPs to */
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;
- /** 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_scale;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
- libdcp::XMLMetadata _dcp_metadata;
+ dcp::XMLMetadata _dcp_metadata;
int _default_j2k_bandwidth;
+ int _default_audio_delay;
std::vector<PresetColourConversion> _colour_conversions;
std::list<boost::shared_ptr<Cinema> > _cinemas;
std::string _mail_server;
+ std::string _mail_user;
+ std::string _mail_password;
+ std::string _kdm_subject;
std::string _kdm_from;
+ std::string _kdm_cc;
+ std::string _kdm_bcc;
std::string _kdm_email;
+ boost::shared_ptr<const dcp::Signer> _signer;
+ dcp::Certificate _decryption_certificate;
+ std::string _decryption_private_key;
+ /** 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;
projects / dcpomatic.git / blobdiff