Remove unnecessary non-const operator[].

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 9e84a120b822755bf667e32b024ba16374bc9537..62a36f084a64fa0444a19b71af143cb104f62904 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -194,10 +194,6 @@ public:
                return _default_still_length;
        }
 
-       Ratio const * default_container () const {
-               return _default_container;
-       }
-
        DCPContentType const * default_dcp_content_type () const {
                return _default_dcp_content_type;
        }
@@ -242,6 +238,14 @@ public:
                return _default_interop;
        }
 
+       boost::optional<dcp::LanguageTag> default_audio_language() const {
+               return _default_audio_language;
+       }
+
+       boost::optional<dcp::LanguageTag::RegionSubtag> default_territory() const {
+               return _default_territory;
+       }
+
        std::map<std::string, std::string> default_metadata () const {
                return _default_metadata;
        }
@@ -722,10 +726,6 @@ public:
                maybe_set (_default_still_length, s);
        }
 
-       void set_default_container (Ratio const * c) {
-               maybe_set (_default_container, c);
-       }
-
        void set_default_dcp_content_type (DCPContentType const * t) {
                maybe_set (_default_dcp_content_type, t);
        }
@@ -770,6 +770,22 @@ public:
                maybe_set (_default_interop, i);
        }
 
+       void set_default_audio_language(dcp::LanguageTag tag) {
+               maybe_set(_default_audio_language, tag);
+       }
+
+       void unset_default_audio_language() {
+               maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>());
+       }
+
+       void set_default_territory(dcp::LanguageTag::RegionSubtag tag) {
+               maybe_set(_default_territory, tag);
+       }
+
+       void unset_default_territory() {
+               maybe_set(_default_territory, boost::optional<dcp::LanguageTag::RegionSubtag>());
+       }
+
        void set_default_metadata (std::map<std::string, std::string> const& metadata) {
                maybe_set (_default_metadata, metadata);
        }
@@ -1289,7 +1305,6 @@ private:
        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;
        int _default_dcp_audio_channels;
        std::string _dcp_issuer;
@@ -1301,6 +1316,8 @@ private:
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        bool _default_interop;
+       boost::optional<dcp::LanguageTag> _default_audio_language;
+       boost::optional<dcp::LanguageTag::RegionSubtag> _default_territory;
        std::map<std::string, std::string> _default_metadata;
        /** Default directory to offer to write KDMs to; if it's not set,
            the home directory will be offered.