Untested use of Frame for video/audio content lengths.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 4f47ab3142be13a3b19aa6c8116b64a21a9187d2..20529911b605ba363b4117454c9759a773a5dade 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>
@@ -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;
        }
@@ -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);
        }
@@ -407,6 +398,8 @@ public:
        void changed ();
        boost::signals2::signal<void ()> Changed;
 
+       void write () const;
+       
        static Config* instance ();
        static void drop ();
        static void restore_defaults ();
@@ -415,7 +408,6 @@ private:
        Config ();
        boost::filesystem::path file () const;
        void read ();
-       void write () const;
        void make_decryption_keys ();
        void set_defaults ();
        void set_kdm_email_to_default ();
@@ -457,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;