projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index b9e8d6b021b3939e454a7e8d319d8e22c0716bf4..d82f520469c258f64b80b27d640a507f0503a962 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
@@
-28,10
+28,9
@@
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
-#include <
lib
dcp/metadata.h>
-#include "
dci
_metadata.h"
+#include <dcp/metadata.h>
+#include "
isdcf
_metadata.h"
#include "colour_conversion.h"
#include "colour_conversion.h"
-#include "server.h"
class ServerDescription;
class Scaler;
class ServerDescription;
class Scaler;
@@
-66,7
+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;
-
write
();
+
changed
();
}
bool use_any_servers () const {
}
bool use_any_servers () const {
@@
-76,7
+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;
-
write
();
+
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 */
@@
-89,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;
}
@@
-116,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 {
@@
-137,7
+140,7
@@
public:
return _default_dcp_content_type;
}
return _default_dcp_content_type;
}
-
lib
dcp::XMLMetadata dcp_metadata () const {
+ dcp::XMLMetadata dcp_metadata () const {
return _dcp_metadata;
}
return _dcp_metadata;
}
@@
-180,150
+183,176
@@
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;
-
write
();
+
changed
();
}
void set_default_directory (boost::filesystem::path d) {
_default_directory = d;
}
void set_default_directory (boost::filesystem::path d) {
_default_directory = d;
-
write
();
+
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;
-
write
();
+
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;
-
write
();
+
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;
-
write
();
+
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;
-
write
();
+
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;
-
write
();
+
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;
- write ();
+ changed ();
+ }
+
+ void set_allow_any_dcp_frame_rate (bool a) {
+ _allow_any_dcp_frame_rate = a;
+ changed ();
}
}
- void set_default_
dci_metadata (DCI
Metadata d) {
- _default_
dci
_metadata = d;
-
write
();
+ void set_default_
isdcf_metadata (ISDCF
Metadata d) {
+ _default_
isdcf
_metadata = d;
+
changed
();
}
void set_language (std::string l) {
_language = l;
}
void set_language (std::string l) {
_language = l;
-
write
();
+
changed
();
}
void unset_language () {
_language = boost::none;
}
void unset_language () {
_language = boost::none;
-
write
();
+
changed
();
}
void set_default_still_length (int s) {
_default_still_length = s;
}
void set_default_still_length (int s) {
_default_still_length = s;
-
write
();
+
changed
();
}
void set_default_container (Ratio const * c) {
_default_container = c;
}
void set_default_container (Ratio const * c) {
_default_container = c;
-
write
();
+
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;
-
write
();
+
changed
();
}
}
- void set_dcp_metadata (
lib
dcp::XMLMetadata m) {
+ void set_dcp_metadata (dcp::XMLMetadata m) {
_dcp_metadata = m;
_dcp_metadata = m;
-
write
();
+
changed
();
}
void set_default_j2k_bandwidth (int b) {
_default_j2k_bandwidth = b;
}
void set_default_j2k_bandwidth (int b) {
_default_j2k_bandwidth = b;
-
write
();
+
changed
();
}
void set_default_audio_delay (int d) {
_default_audio_delay = d;
}
void set_default_audio_delay (int d) {
_default_audio_delay = d;
-
write
();
+
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;
-
write
();
+
changed
();
}
void set_mail_server (std::string s) {
_mail_server = s;
}
void set_mail_server (std::string s) {
_mail_server = s;
-
write
();
+
changed
();
}
void set_mail_user (std::string u) {
_mail_user = u;
}
void set_mail_user (std::string u) {
_mail_user = u;
-
write
();
+
changed
();
}
void set_mail_password (std::string p) {
_mail_password = p;
}
void set_mail_password (std::string p) {
_mail_password = p;
-
write
();
+
changed
();
}
void set_kdm_from (std::string f) {
_kdm_from = f;
}
void set_kdm_from (std::string f) {
_kdm_from = f;
-
write
();
+
changed
();
}
void set_kdm_email (std::string e) {
_kdm_email = e;
}
void set_kdm_email (std::string e) {
_kdm_email = e;
-
write
();
+
changed
();
}
void set_check_for_updates (bool c) {
_check_for_updates = c;
}
void set_check_for_updates (bool c) {
_check_for_updates = c;
-
write
();
+
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;
- write ();
+ changed ();
+ }
+
+ void set_maximum_j2k_bandwidth (int b) {
+ _maximum_j2k_bandwidth = b;
+ changed ();
}
}
-
- void write () const;
+ 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 ();
@@
-332,6
+361,7
@@
private:
boost::filesystem::path file (bool) const;
void read ();
void read_old_metadata ();
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;
@@
-356,13
+386,15
@@
private:
/** Our sound processor */
SoundProcessor const * _sound_processor;
std::list<int> _allowed_dcp_frame_rates;
/** 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;
+ /** 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;
DCPContentType const * _default_dcp_content_type;
boost::optional<std::string> _language;
int _default_still_length;
Ratio const * _default_container;
DCPContentType const * _default_dcp_content_type;
-
lib
dcp::XMLMetadata _dcp_metadata;
+ dcp::XMLMetadata _dcp_metadata;
int _default_j2k_bandwidth;
int _default_audio_delay;
std::vector<PresetColourConversion> _colour_conversions;
int _default_j2k_bandwidth;
int _default_audio_delay;
std::vector<PresetColourConversion> _colour_conversions;
@@
-375,6
+407,9
@@
private:
/** true to check for updates on startup */
bool _check_for_updates;
bool _check_for_test_updates;
/** 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;