Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 3371e48bfc3b5dfa5cc1815b04de8d9f33c8d1c4..eb8f88da9566f061e70ccf5e87ebbcfd11ab5279 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -25,7 +25,6 @@
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include "isdcf_metadata.h"
 #include "types.h"
 #include "state.h"
 #include "edid.h"
@@ -166,10 +165,6 @@ public:
                return _show_experimental_audio_processors;
        }
 
-       ISDCFMetadata default_isdcf_metadata () const {
-               return _default_isdcf_metadata;
-       }
-
        boost::optional<std::string> language () const {
                return _language;
        }
@@ -392,6 +387,9 @@ public:
                return _jump_to_selected;
        }
 
+       /* This could be an enum class but we use the enum a lot to index _nagged
+        * so it means a lot of casts.
+        */
        enum Nag {
                NAG_DKDM_CONFIG,
                NAG_ENCRYPTED_METADATA,
@@ -400,6 +398,7 @@ public:
                NAG_IMPORT_DECRYPTION_CHAIN,
                NAG_DELETE_DKDM,
                NAG_32_ON_64,
+               NAG_TOO_MANY_DROPPED_FRAMES,
                NAG_COUNT
        };
 
@@ -632,10 +631,6 @@ public:
                maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS);
        }
 
-       void set_default_isdcf_metadata (ISDCFMetadata d) {
-               maybe_set (_default_isdcf_metadata, d);
-       }
-
        void set_language (std::string l) {
                if (_language && _language.get() == l) {
                        return;
@@ -1170,8 +1165,6 @@ private:
        bool _allow_any_container;
        /** Offer the upmixers in the audio processor settings */
        bool _show_experimental_audio_processors;
-       /** 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;