Merge 1.0 in.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 40d06a1721493ab8105b13109c881ec37fd3b19c..48eabd54ca3dc33b6f395f34c8981256413ce9f0 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;
@@ -36,7 +38,7 @@ class Filter;
 class SoundProcessor;
 class DCPContentType;
 class Ratio;
-class ColourConversion;
+class Cinema;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -62,7 +64,7 @@ public:
        }
 
        /** @return J2K encoding servers to use */
-       std::vector<boost::shared_ptr<ServerDescription> > servers () const {
+       std::vector<ServerDescription> servers () const {
                return _servers;
        }
 
@@ -91,6 +93,10 @@ public:
                return _sound_processor;
        }
 
+       std::list<boost::shared_ptr<Cinema> > cinemas () const {
+               return _cinemas;
+       }
+       
        std::list<int> allowed_dcp_frame_rates () const {
                return _allowed_dcp_frame_rates;
        }
@@ -123,7 +129,7 @@ public:
                return _default_j2k_bandwidth;
        }
 
-       std::vector<boost::shared_ptr<ColourConversion> > colour_conversions () const {
+       std::vector<PresetColourConversion> colour_conversions () const {
                return _colour_conversions;
        }
 
@@ -142,7 +148,7 @@ public:
        }
 
        /** @param s New list of servers */
-       void set_servers (std::vector<boost::shared_ptr<ServerDescription> > s) {
+       void set_servers (std::vector<ServerDescription> s) {
                _servers = s;
        }
 
@@ -174,6 +180,14 @@ public:
                _tms_password = p;
        }
 
+       void add_cinema (boost::shared_ptr<Cinema> c) {
+               _cinemas.push_back (c);
+       }
+
+       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;
        }
@@ -210,12 +224,14 @@ public:
                _default_j2k_bandwidth = b;
        }
 
-       void set_colour_conversions (std::vector<boost::shared_ptr<ColourConversion> > const & c) {
+       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 ();
 
@@ -233,7 +249,7 @@ private:
        int _server_port;
 
        /** J2K encoding servers to use */
-       std::vector<boost::shared_ptr<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 */
@@ -257,7 +273,9 @@ private:
        DCPContentType const * _default_dcp_content_type;
        libdcp::XMLMetadata _dcp_metadata;
        int _default_j2k_bandwidth;
-       std::vector<boost::shared_ptr<ColourConversion> > _colour_conversions;
+       std::vector<PresetColourConversion> _colour_conversions;
+
+       std::list<boost::shared_ptr<Cinema> > _cinemas;
 
        /** Singleton instance, or 0 */
        static Config* _instance;