X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.h;fp=src%2Flib%2Fconfig.h;h=05005e5903d374a97472821976001320351c8133;hp=a59cdcae0df448e61fb03c0e7694162e25a1600d;hb=cd4a82d90677cec80e891ac190000cb70767446f;hpb=1738f2e7336734190bed7e94ce3d691d4a9c9e4c

diff --git a/src/lib/config.h b/src/lib/config.h
index a59cdcae0..05005e590 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -21,8 +21,8 @@
  *  @brief Class holding configuration.
  */
 
-#ifndef DVDOMATIC_CONFIG_H
-#define DVDOMATIC_CONFIG_H
+#ifndef DCPOMATIC_CONFIG_H
+#define DCPOMATIC_CONFIG_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
@@ -110,6 +110,10 @@ public:
 		return _language;
 	}
 
+	int default_still_length () const {
+		return _default_still_length;
+	}
+
 	Format const * default_format () const {
 		return _default_format;
 	}
@@ -185,6 +189,10 @@ public:
 		_language = boost::none;
 	}
 
+	void set_default_still_length (int s) {
+		_default_still_length = s;
+	}
+
 	void set_default_format (Format const * f) {
 		_default_format = f;
 	}
@@ -204,7 +212,8 @@ public:
 
 private:
 	Config ();
-	std::string file () const;
+	std::string file (bool) const;
+	void read_old_metadata ();
 
 	/** number of threads to use for J2K encoding on the local machine */
 	int _num_local_encoding_threads;
@@ -233,6 +242,7 @@ private:
 	/** Default DCI metadata for newly-created Films */
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;
+	int _default_still_length;
 	Format const * _default_format;
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;