Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/config.h b/src/lib/config.h
index db32c58a0fdfb94da163b1a29667a96083fcf789..90ebb0b33c3518022837d033fda1d95ca56b74e8 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -376,6 +376,12 @@ public:
                return _frames_in_memory_multiplier;
        }
 
+       boost::optional<int> decode_reduction () const {
+               return _decode_reduction;
+       }
+
+       /* SET (mostly) */
+
        void set_master_encoding_threads (int n) {
                maybe_set (_master_encoding_threads, n);
        }
@@ -651,6 +657,10 @@ public:
                maybe_set (_frames_in_memory_multiplier, m);
        }
 
+       void set_decode_reduction (boost::optional<int> r) {
+               maybe_set (_decode_reduction, r);
+       }
+
        void clear_history () {
                _history.clear ();
                changed ();
@@ -719,6 +729,7 @@ private:
        boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
        boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;
        void add_to_history_internal (std::vector<boost::filesystem::path>& h, boost::filesystem::path p);
+       void backup ();
 
        template <class T>
        void maybe_set (T& member, T new_value, Property prop = OTHER) {
@@ -832,6 +843,9 @@ private:
        boost::optional<KDMWriteType> _last_kdm_write_type;
        boost::optional<DKDMWriteType> _last_dkdm_write_type;
        int _frames_in_memory_multiplier;
+       boost::optional<int> _decode_reduction;
+
+       static int const _current_version;
 
        /** Singleton instance, or 0 */
        static Config* _instance;