X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=913372c317e1aa9f2dd5f058184531edc678e204;hb=f4964573a60155545e02cbbebc47199f7480cf14;hp=6b1f3fb874e16cb13d858e4fa3302ed8bb256733;hpb=c55877926307d7018942beb5fd65a39f278e05de;p=dcpomatic.git diff --git a/src/lib/config.h b/src/lib/config.h index 6b1f3fb87..913372c31 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 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,7 +26,9 @@ #define DCPOMATIC_CONFIG_H #include "isdcf_metadata.h" +#include "kdm_filename_format.h" #include "types.h" +#include #include #include #include @@ -151,6 +154,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; } @@ -195,7 +202,7 @@ public: return _kdm_from; } - std::string kdm_cc () const { + std::vector kdm_cc () const { return _kdm_cc; } @@ -231,6 +238,10 @@ public: return _log_types; } + bool analyse_ebur128 () const { + return _analyse_ebur128; + } + bool automatic_audio_analysis () const { return _automatic_audio_analysis; } @@ -249,6 +260,22 @@ public: return _dkdms; } + boost::filesystem::path cinemas_file () const { + return _cinemas_file; + } + + bool show_hints_before_make_dcp () const { + return _show_hints_before_make_dcp; + } + + KDMFilenameFormat kdm_filename_format () const { + return _kdm_filename_format; + } + + dcp::FilenameFormat dcp_filename_format () const { + return _dcp_filename_format; + } + /** @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 +369,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); } @@ -386,7 +417,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); } @@ -427,6 +458,10 @@ 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); } @@ -443,6 +478,20 @@ public: 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 set_kdm_filename_format (KDMFilenameFormat n) { + maybe_set (_kdm_filename_format, n); + } + + void set_dcp_filename_format (dcp::FilenameFormat n) { + maybe_set (_dcp_filename_format, n); + } + void clear_history () { _history.clear (); changed (); @@ -452,20 +501,27 @@ public: void changed (Property p = OTHER); boost::signals2::signal Changed; + /** Emitted if ::read() failed on an existing Config file. There is nothing + a listener can do about it: this is just for information. + */ + static boost::signals2::signal FailedToLoad; void write () const; 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 (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 write_config_xml () const; + void write_cinemas_xml () const; + void read_cinemas (cxml::Document const & f); boost::shared_ptr create_certificate_chain (); template @@ -511,6 +567,7 @@ 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; @@ -523,7 +580,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; @@ -537,12 +594,17 @@ 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; + KDMFilenameFormat _kdm_filename_format; + dcp::FilenameFormat _dcp_filename_format; /** Singleton instance, or 0 */ static Config* _instance;