X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.h;h=37a55a6954f7f9f7db41fc1b8ebceef19fb5cdc2;hb=fe9d2a290682021cd12a00bf21fa4db3012e2049;hp=109f7b603790bcd43f47a8d10ed6bb62de2679af;hpb=4228cb5b5323e9dc4bc87182b27427e48bb59d91;p=dcpomatic.git

diff --git a/src/lib/config.h b/src/lib/config.h
index 109f7b603..37a55a695 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,7 +26,9 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
+#include "kdm_name_format.h"
 #include "types.h"
+#include <dcp/filename_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/shared_ptr.hpp>
@@ -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;
 	}
@@ -231,6 +238,10 @@ public:
 		return _log_types;
 	}
 
+	bool analyse_ebur128 () const {
+		return _analyse_ebur128;
+	}
+
 	bool automatic_audio_analysis () const {
 		return _automatic_audio_analysis;
 	}
@@ -253,6 +264,18 @@ public:
 		return _cinemas_file;
 	}
 
+	bool show_hints_before_make_dcp () const {
+		return _show_hints_before_make_dcp;
+	}
+
+	KDMNameFormat 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);
@@ -346,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);
 	}
@@ -431,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);
 	}
@@ -449,6 +480,18 @@ public:
 
 	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 (KDMNameFormat 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 ();
@@ -458,6 +501,10 @@ public:
 
 	void changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> 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<void ()> FailedToLoad;
 
 	void write () const;
 
@@ -520,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;
@@ -546,6 +594,7 @@ 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;
@@ -553,6 +602,9 @@ private:
 	std::vector<boost::filesystem::path> _history;
 	std::vector<dcp::EncryptedKDM> _dkdms;
 	boost::filesystem::path _cinemas_file;
+	bool _show_hints_before_make_dcp;
+	KDMNameFormat _kdm_filename_format;
+	dcp::FilenameFormat _dcp_filename_format;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;