X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=feaac8390842b902559ea3d90e86f7e0156f7d5e;hb=02cc8c7680381c123a31c23a43f6b34a04c2115a;hp=0839ea994d1dc0a8449d6e3e0ffdd5d3e71bacf7;hpb=c450fb19ea21dba0a6cade81e829262e7078e9df;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 0839ea994..feaac8390 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - 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. - 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 - 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 . */ @@ -25,18 +26,14 @@ #define DCPOMATIC_CONFIG_H #include "isdcf_metadata.h" -#include "video_content.h" -#include -#include +#include "types.h" #include +#include #include #include #include #include -class ServerDescription; -class Scaler; -class Filter; class CinemaSoundProcessor; class DCPContentType; class Ratio; @@ -155,6 +152,10 @@ public: return _default_dcp_content_type; } + int default_dcp_audio_channels () const { + return _default_dcp_audio_channels; + } + std::string dcp_issuer () const { return _dcp_issuer; } @@ -171,6 +172,10 @@ public: return _default_audio_delay; } + bool default_interop () const { + return _default_interop; + } + std::string mail_server () const { return _mail_server; } @@ -195,7 +200,7 @@ public: return _kdm_from; } - std::string kdm_cc () const { + std::vector kdm_cc () const { return _kdm_cc; } @@ -231,6 +236,14 @@ public: return _log_types; } + bool analyse_ebur128 () const { + return _analyse_ebur128; + } + + bool automatic_audio_analysis () const { + return _automatic_audio_analysis; + } + #ifdef DCPOMATIC_WINDOWS bool win32_console () const { return _win32_console; @@ -241,6 +254,18 @@ public: return _history; } + std::vector dkdms () const { + return _dkdms; + } + + boost::filesystem::path cinemas_file () const { + return _cinemas_file; + } + + bool show_hints_before_make_dcp () const { + return _show_hints_before_make_dcp; + } + /** @param n New number of local encoding threads */ void set_num_local_encoding_threads (int n) { maybe_set (_num_local_encoding_threads, n); @@ -334,6 +359,10 @@ public: 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); } @@ -350,6 +379,10 @@ public: maybe_set (_default_audio_delay, d); } + void set_default_interop (bool i) { + maybe_set (_default_interop, i); + } + void set_mail_server (std::string s) { maybe_set (_mail_server, s); } @@ -374,7 +407,7 @@ public: maybe_set (_kdm_from, f); } - void set_kdm_cc (std::string f) { + void set_kdm_cc (std::vector f) { maybe_set (_kdm_cc, f); } @@ -398,6 +431,9 @@ public: void set_check_for_updates (bool c) { maybe_set (_check_for_updates, c); + if (!c) { + set_check_for_test_updates (false); + } } void set_check_for_test_updates (bool c) { @@ -412,12 +448,32 @@ public: 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); + } + #ifdef DCPOMATIC_WINDOWS void set_win32_console (bool c) { maybe_set (_win32_console, c); } #endif + void set_dkdms (std::vector dkdms) + { + _dkdms = dkdms; + changed (); + } + + void set_cinemas_file (boost::filesystem::path file); + + void set_show_hints_before_make_dcp (bool s) { + maybe_set (_show_hints_before_make_dcp, s); + } + void clear_history () { _history.clear (); changed (); @@ -433,14 +489,18 @@ public: static Config* instance (); static void drop (); static void restore_defaults (); - static bool have_existing (); + static bool have_existing (std::string); private: Config (); - static boost::filesystem::path file (); + static boost::filesystem::path path (std::string file, bool create_directories = true); 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 create_certificate_chain (); template void maybe_set (T& member, T new_value) { @@ -456,7 +516,7 @@ private: /** default directory to put new films in */ boost::filesystem::path _default_directory; /** base port number to use for J2K encoding servers; - * this port and the one above it will be used. + * this port and the two above it will be used. */ int _server_port_base; /** true to broadcast on the `any' address to look for servers */ @@ -485,10 +545,12 @@ private: 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; int _default_audio_delay; + bool _default_interop; std::list > _cinemas; std::string _mail_server; int _mail_port; @@ -496,7 +558,7 @@ private: std::string _mail_password; std::string _kdm_subject; std::string _kdm_from; - std::string _kdm_cc; + std::vector _kdm_cc; std::string _kdm_bcc; std::string _kdm_email; boost::shared_ptr _signer_chain; @@ -510,10 +572,15 @@ private: /** 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 _history; + std::vector _dkdms; + boost::filesystem::path _cinemas_file; + bool _show_hints_before_make_dcp; /** Singleton instance, or 0 */ static Config* _instance;