Merge 1.0 in.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index ee4e4eaec49cd2a098eb04b66a4b49b517d4cee4..48eabd54ca3dc33b6f395f34c8981256413ce9f0 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -21,23 +21,29 @@
  *  @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"
+#include "colour_conversion.h"
+#include "server.h"
 
 class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
+class DCPContentType;
+class Ratio;
 class Cinema;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
  */
-class Config
+class Config : public boost::noncopyable
 {
 public:
 
@@ -58,18 +64,10 @@ public:
        }
 
        /** @return J2K encoding servers to use */
-       std::vector<ServerDescription*> servers () const {
+       std::vector<ServerDescription> servers () const {
                return _servers;
        }
 
-       Scaler const * reference_scaler () const {
-               return _reference_scaler;
-       }
-
-       std::vector<Filter const *> reference_filters () const {
-               return _reference_filters;
-       }
-
        /** @return The IP address of a TMS that we can copy DCPs to */
        std::string tms_ip () const {
                return _tms_ip;
@@ -98,6 +96,42 @@ public:
        std::list<boost::shared_ptr<Cinema> > cinemas () const {
                return _cinemas;
        }
+       
+       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;
+       }
+
+       Ratio const * default_container () const {
+               return _default_container;
+       }
+
+       DCPContentType const * default_dcp_content_type () const {
+               return _default_dcp_content_type;
+       }
+
+       libdcp::XMLMetadata dcp_metadata () const {
+               return _dcp_metadata;
+       }
+
+       int default_j2k_bandwidth () const {
+               return _default_j2k_bandwidth;
+       }
+
+       std::vector<PresetColourConversion> colour_conversions () const {
+               return _colour_conversions;
+       }
 
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
@@ -114,7 +148,7 @@ public:
        }
 
        /** @param s New list of servers */
-       void set_servers (std::vector<ServerDescription*> s) {
+       void set_servers (std::vector<ServerDescription> s) {
                _servers = s;
        }
 
@@ -153,17 +187,59 @@ public:
        void remove_cinema (boost::shared_ptr<Cinema> c) {
                _cinemas.remove (c);
        }
+
+       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_container (Ratio const * c) {
+               _default_container = c;
+       }
+
+       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 set_default_j2k_bandwidth (int b) {
+               _default_j2k_bandwidth = b;
+       }
+
+       void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
+               _colour_conversions = c;
+       }
        
        void write () const;
 
        std::string crypt_chain_directory () const;
 
        static Config* instance ();
+       static void drop ();
 
 private:
        Config ();
-       std::string read_file () const;
-       std::string write_file () const;
+       std::string file (bool) const;
+       void read ();
+       void read_old_metadata ();
 
        /** number of threads to use for J2K encoding on the local machine */
        int _num_local_encoding_threads;
@@ -173,7 +249,7 @@ private:
        int _server_port;
 
        /** J2K encoding servers to use */
-       std::vector<ServerDescription *> _servers;
+       std::vector<ServerDescription> _servers;
        /** Scaler to use for the "A" part of A/B comparisons */
        Scaler const * _reference_scaler;
        /** Filters to use for the "A" part of A/B comparisons */
@@ -188,6 +264,16 @@ 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;
+       Ratio const * _default_container;
+       DCPContentType const * _default_dcp_content_type;
+       libdcp::XMLMetadata _dcp_metadata;
+       int _default_j2k_bandwidth;
+       std::vector<PresetColourConversion> _colour_conversions;
 
        std::list<boost::shared_ptr<Cinema> > _cinemas;