pot/merge.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index c6bf5986bc7626de1bbbf37aec4ec26755b9d645..91d779b7ad7b0bcca7b6c06c25542c9fcec408d0 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -31,7 +31,6 @@
 #include "export_config.h"
 #include "rough_duration.h"
 #include "state.h"
-#include "types.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
@@ -94,6 +93,7 @@ public:
                SHOW_EXPERIMENTAL_AUDIO_PROCESSORS,
                AUDIO_MAPPING,
                AUTO_CROP_THRESHOLD,
+               ALLOW_SMPTE_BV20,
                OTHER
        };
 
@@ -242,6 +242,10 @@ public:
                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;
        }
@@ -562,9 +566,7 @@ public:
                return _custom_languages;
        }
 
-       boost::optional<boost::filesystem::path> add_files_path () const {
-               return _add_files_path;
-       }
+       boost::optional<boost::filesystem::path> initial_path(std::string id) const;
 
        bool use_isdcf_name_by_default () const {
                return _use_isdcf_name_by_default;
@@ -602,6 +604,19 @@ public:
                return _main_content_divider_sash_position;
        }
 
+       enum class DefaultAddFileLocation {
+               SAME_AS_LAST_TIME,
+               SAME_AS_PROJECT
+       };
+
+       DefaultAddFileLocation default_add_file_location() const {
+               return _default_add_file_location;
+       }
+
+       bool allow_smpte_bv20() const {
+               return _allow_smpte_bv20;
+       }
+
        /* SET (mostly) */
 
        void set_master_encoding_threads (int n) {
@@ -774,6 +789,14 @@ public:
                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);
        }
@@ -1117,10 +1140,7 @@ public:
 
        void add_custom_language (dcp::LanguageTag tag);
 
-       void set_add_files_path (boost::filesystem::path p) {
-               _add_files_path = p;
-               changed ();
-       }
+       void set_initial_path(std::string id, boost::filesystem::path path);
 
        void set_use_isdcf_name_by_default (bool use) {
                maybe_set (_use_isdcf_name_by_default, use);
@@ -1166,6 +1186,14 @@ public:
                maybe_set(_main_content_divider_sash_position, position);
        }
 
+       void set_default_add_file_location(DefaultAddFileLocation location) {
+               maybe_set(_default_add_file_location, location);
+       }
+
+       void set_allow_smpte_bv20(bool allow) {
+               maybe_set(_allow_smpte_bv20, allow, ALLOW_SMPTE_BV20);
+       }
+
        void changed (Property p = OTHER);
        boost::signals2::signal<void (Property)> Changed;
        /** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1305,6 +1333,7 @@ private:
        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.
@@ -1391,7 +1420,7 @@ private:
        boost::optional<boost::filesystem::path> _player_kdm_directory;
        boost::optional<AudioMapping> _audio_mapping;
        std::vector<dcp::LanguageTag> _custom_languages;
-       boost::optional<boost::filesystem::path> _add_files_path;
+       std::map<std::string, boost::optional<boost::filesystem::path>> _initial_paths;
        bool _use_isdcf_name_by_default;
        bool _write_kdms_to_disk;
        bool _email_kdms;
@@ -1401,6 +1430,8 @@ private:
        boost::optional<std::string> _last_release_notes_version;
        boost::optional<int> _main_divider_sash_position;
        boost::optional<int> _main_content_divider_sash_position;
+       DefaultAddFileLocation _default_add_file_location;
+       bool _allow_smpte_bv20;
 
        ExportConfig _export;