Merge master.

[dcpomatic.git] / src / lib / config.h

diff --git a/src/lib/config.h b/src/lib/config.h
index 5113236d652fabdb0e989c3effd6fdbf81599ae1..05005e5903d374a97472821976001320351c8133 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -21,17 +21,21 @@
  *  @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>
 #include <boost/signals2.hpp>
+#include <libdcp/metadata.h>
+#include "dci_metadata.h"
 
 class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
+class Format;
+class DCPContentType;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -56,19 +60,6 @@ public:
                return _server_port;
        }
 
-       /** @return index of colour LUT to use when converting RGB to XYZ.
-        *  0: sRGB
-        *  1: Rec 709
-        */
-       int colour_lut_index () const {
-               return _colour_lut_index;
-       }
-
-       /** @return bandwidth for J2K files in bits per second */
-       int j2k_bandwidth () const {
-               return _j2k_bandwidth;
-       }
-
        /** @return J2K encoding servers to use */
        std::vector<ServerDescription*> servers () const {
                return _servers;
@@ -102,10 +93,39 @@ public:
                return _tms_password;
        }
 
+       /** @return The sound processor that we are using */
        SoundProcessor const * sound_processor () const {
                return _sound_processor;
        }
 
+       std::list<int> allowed_dcp_frame_rates () const {
+               return _allowed_dcp_frame_rates;
+       }
+       
+       DCIMetadata default_dci_metadata () const {
+               return _default_dci_metadata;
+       }
+
+       boost::optional<std::string> language () const {
+               return _language;
+       }
+
+       int default_still_length () const {
+               return _default_still_length;
+       }
+
+       Format const * default_format () const {
+               return _default_format;
+       }
+
+       DCPContentType const * default_dcp_content_type () const {
+               return _default_dcp_content_type;
+       }
+
+       libdcp::XMLMetadata dcp_metadata () const {
+               return _dcp_metadata;
+       }
+
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                _num_local_encoding_threads = n;
@@ -120,16 +140,6 @@ public:
                _server_port = p;
        }
 
-       /** @param i New colour LUT index */
-       void set_colour_lut_index (int i) {
-               _colour_lut_index = i;
-       }
-
-       /** @param b New J2K bandwidth */
-       void set_j2k_bandwidth (int b) {
-               _j2k_bandwidth = b;
-       }
-
        /** @param s New list of servers */
        void set_servers (std::vector<ServerDescription*> s) {
                _servers = s;
@@ -162,14 +172,48 @@ public:
        void set_tms_password (std::string p) {
                _tms_password = p;
        }
+
+       void set_allowed_dcp_frame_rates (std::list<int> const & r) {
+               _allowed_dcp_frame_rates = r;
+       }
+
+       void set_default_dci_metadata (DCIMetadata d) {
+               _default_dci_metadata = d;
+       }
+
+       void set_language (std::string l) {
+               _language = l;
+       }
+
+       void unset_language () {
+               _language = boost::none;
+       }
+
+       void set_default_still_length (int s) {
+               _default_still_length = s;
+       }
+
+       void set_default_format (Format const * f) {
+               _default_format = f;
+       }
+
+       void set_default_dcp_content_type (DCPContentType const * t) {
+               _default_dcp_content_type = t;
+       }
+
+       void set_dcp_metadata (libdcp::XMLMetadata m) {
+               _dcp_metadata = m;
+       }
        
        void write () const;
 
        static Config* instance ();
+       static void drop ();
 
 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;
@@ -177,12 +221,6 @@ private:
        std::string _default_directory;
        /** port to use for J2K encoding servers */
        int _server_port;
-       /** index of colour LUT to use when converting RGB to XYZ
-        *  (see colour_lut_index ())
-        */
-       int _colour_lut_index;
-       /** bandwidth for J2K files in bits per second */
-       int _j2k_bandwidth;
 
        /** J2K encoding servers to use */
        std::vector<ServerDescription *> _servers;
@@ -200,6 +238,14 @@ private:
        std::string _tms_password;
        /** 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;
+       boost::optional<std::string> _language;
+       int _default_still_length;
+       Format const * _default_format;
+       DCPContentType const * _default_dcp_content_type;
+       libdcp::XMLMetadata _dcp_metadata;
 
        /** Singleton instance, or 0 */
        static Config* _instance;