Fix _audio_pts_offset setup when we are only processing audio.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 110bcc6a8de5dabbd3aa9a19110f60cb0b200403..bce6bfd7e2707ecbd7a196ee60ac69f4d1df5426 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -29,6 +29,8 @@
 #include <boost/signals2.hpp>
 #include <libdcp/metadata.h>
 #include "dci_metadata.h"
+#include "colour_conversion.h"
+#include "server.h"
 
 class ServerDescription;
 class Scaler;
@@ -40,7 +42,7 @@ class Ratio;
 /** @class Config
  *  @brief A singleton class holding configuration.
  */
-class Config
+class Config : public boost::noncopyable
 {
 public:
 
@@ -61,18 +63,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;
@@ -126,6 +120,14 @@ public:
                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) {
                _num_local_encoding_threads = n;
@@ -141,7 +143,7 @@ public:
        }
 
        /** @param s New list of servers */
-       void set_servers (std::vector<ServerDescription*> s) {
+       void set_servers (std::vector<ServerDescription> s) {
                _servers = s;
        }
 
@@ -204,6 +206,14 @@ public:
        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;
 
@@ -224,7 +234,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 */
@@ -247,6 +257,8 @@ private:
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        libdcp::XMLMetadata _dcp_metadata;
+       int _default_j2k_bandwidth;
+       std::vector<PresetColourConversion> _colour_conversions;
 
        /** Singleton instance, or 0 */
        static Config* _instance;