Remove Monitor / EDID code that was used for the swaroop variant.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 0a48a00e1dfc8a71ac66e77ca26a07d73610e2c4..1662671249209ec4abc60ce070351de6bdcb8da3 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -25,10 +25,8 @@
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include "isdcf_metadata.h"
 #include "types.h"
 #include "state.h"
-#include "edid.h"
 #include "audio_mapping.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
@@ -166,10 +164,6 @@ public:
                return _show_experimental_audio_processors;
        }
 
-       ISDCFMetadata default_isdcf_metadata () const {
-               return _default_isdcf_metadata;
-       }
-
        boost::optional<std::string> language () const {
                return _language;
        }
@@ -541,10 +535,6 @@ public:
 
        AudioMapping audio_mapping (int output_channels);
 
-       int minimum_frame_size () const {
-               return _minimum_frame_size;
-       }
-
        std::vector<dcp::LanguageTag> custom_languages () const {
                return _custom_languages;
        }
@@ -636,10 +626,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;
@@ -1060,10 +1046,6 @@ public:
        void set_audio_mapping (AudioMapping m);
        void set_audio_mapping_to_default ();
 
-       void set_minimum_frame_size (int size) {
-               maybe_set (_minimum_frame_size, size);
-       }
-
        void add_custom_language (dcp::LanguageTag tag);
 
        void changed (Property p = OTHER);
@@ -1174,8 +1156,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;
@@ -1279,7 +1259,6 @@ private:
        boost::optional<boost::filesystem::path> _player_playlist_directory;
        boost::optional<boost::filesystem::path> _player_kdm_directory;
        boost::optional<AudioMapping> _audio_mapping;
-       int _minimum_frame_size;
        std::vector<dcp::LanguageTag> _custom_languages;
 
        static int const _current_version;