Merge master branch.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index c57e6b9530193c7d6fc7a3b9a3b7b0e13704bae6..c41437efbe290f6aacad37ec5387fd21dc4d99db 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -29,7 +29,6 @@
 #include <boost/signals2.hpp>
 
 class ServerDescription;
-class Screen;
 class Scaler;
 class Filter;
 class SoundProcessor;
@@ -57,28 +56,11 @@ 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;
        }
 
-       std::vector<boost::shared_ptr<Screen> > screens () const {
-               return _screens;
-       }
-
        Scaler const * reference_scaler () const {
                return _reference_scaler;
        }
@@ -107,10 +89,15 @@ 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;
+       }
+       
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                _num_local_encoding_threads = n;
@@ -125,25 +112,11 @@ 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;
        }
 
-       void set_screens (std::vector<boost::shared_ptr<Screen> > s) {
-               _screens = s;
-       }
-
        void set_reference_scaler (Scaler const * s) {
                _reference_scaler = s;
        }
@@ -171,7 +144,11 @@ 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 write () const;
 
        static Config* instance ();
@@ -186,17 +163,9 @@ 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;
-       /** Screen definitions */
-       std::vector<boost::shared_ptr<Screen> > _screens;
        /** 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 */
@@ -211,6 +180,7 @@ private:
        std::string _tms_password;
        /** Our sound processor */
        SoundProcessor const * _sound_processor;
+       std::list<int> _allowed_dcp_frame_rates;
 
        /** Singleton instance, or 0 */
        static Config* _instance;