No-op: remove all trailing whitespace.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index f436061e82754d1e92a0d5bc5deeb70847bc72df..0040591f165543c4b895c9171397aa91b7e95eaa 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -25,7 +25,6 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "colour_conversion.h"
 #include "video_content.h"
 #include <dcp/metadata.h>
 #include <dcp/certificates.h>
@@ -89,7 +88,7 @@ public:
        std::string tms_ip () const {
                return _tms_ip;
        }
-       
+
        /** @return The path on a TMS that we should changed DCPs to */
        std::string tms_path () const {
                return _tms_path;
@@ -113,7 +112,7 @@ public:
        std::list<boost::shared_ptr<Cinema> > cinemas () const {
                return _cinemas;
        }
-       
+
        std::list<int> allowed_dcp_frame_rates () const {
                return _allowed_dcp_frame_rates;
        }
@@ -121,7 +120,7 @@ public:
        bool allow_any_dcp_frame_rate () const {
                return _allow_any_dcp_frame_rate;
        }
-       
+
        ISDCFMetadata default_isdcf_metadata () const {
                return _default_isdcf_metadata;
        }
@@ -154,10 +153,6 @@ public:
                return _default_audio_delay;
        }
 
-       std::vector<PresetColourConversion> colour_conversions () const {
-               return _colour_conversions;
-       }
-
        std::string mail_server () const {
                return _mail_server;
        }
@@ -185,7 +180,7 @@ public:
        std::string kdm_bcc () const {
                return _kdm_bcc;
        }
-       
+
        std::string kdm_email () const {
                return _kdm_email;
        }
@@ -218,11 +213,11 @@ public:
                return _log_types;
        }
 
-#ifdef DCPOMATIC_WINDOWS       
+#ifdef DCPOMATIC_WINDOWS
        bool win32_console () const {
                return _win32_console;
        }
-#endif 
+#endif
 
        std::vector<boost::filesystem::path> history () const {
                return _history;
@@ -296,7 +291,7 @@ public:
                if (!_language) {
                        return;
                }
-                       
+
                _language = boost::none;
                changed ();
        }
@@ -325,10 +320,6 @@ public:
                maybe_set (_default_audio_delay, d);
        }
 
-       void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
-               maybe_set (_colour_conversions, c);
-       }
-
        void set_mail_server (std::string s) {
                maybe_set (_mail_server, s);
        }
@@ -356,7 +347,7 @@ public:
        void set_kdm_bcc (std::string f) {
                maybe_set (_kdm_bcc, f);
        }
-       
+
        void set_kdm_email (std::string e) {
                maybe_set (_kdm_email, e);
        }
@@ -391,11 +382,11 @@ public:
                maybe_set (_log_types, t);
        }
 
-#ifdef DCPOMATIC_WINDOWS       
+#ifdef DCPOMATIC_WINDOWS
        void set_win32_console (bool c) {
                maybe_set (_win32_console, c);
        }
-#endif 
+#endif
 
        void clear_history () {
                _history.clear ();
@@ -403,12 +394,12 @@ public:
        }
 
        void add_to_history (boost::filesystem::path p);
-       
+
        void changed ();
        boost::signals2::signal<void ()> Changed;
 
        void write () const;
-       
+
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
@@ -458,13 +449,13 @@ private:
        /** Default ISDCF metadata for newly-created Films */
        ISDCFMetadata _default_isdcf_metadata;
        boost::optional<std::string> _language;
+       /** Default length of still image content (seconds) */
        int _default_still_length;
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        std::string _dcp_issuer;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
-       std::vector<PresetColourConversion> _colour_conversions;
        std::list<boost::shared_ptr<Cinema> > _cinemas;
        std::string _mail_server;
        std::string _mail_user;
@@ -483,11 +474,11 @@ private:
        /** maximum allowed J2K bandwidth in bits per second */
        int _maximum_j2k_bandwidth;
        int _log_types;
-#ifdef DCPOMATIC_WINDOWS       
+#ifdef DCPOMATIC_WINDOWS
        bool _win32_console;
-#endif 
+#endif
        std::vector<boost::filesystem::path> _history;
-       
+
        /** Singleton instance, or 0 */
        static Config* _instance;
 };