projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remember the path used for "add files" (#2049).
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 0e8fccb5330d73a8470faaecd99368aa362da05e..5b64922e61ab3c65a1b7ddcc19af39aebbc569f8 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-25,14
+25,13
@@
#ifndef DCPOMATIC_CONFIG_H
#define DCPOMATIC_CONFIG_H
#ifndef DCPOMATIC_CONFIG_H
#define DCPOMATIC_CONFIG_H
-#include "isdcf_metadata.h"
#include "types.h"
#include "state.h"
#include "types.h"
#include "state.h"
-#include "edid.h"
#include "audio_mapping.h"
#include <dcp/name_format.h>
#include <dcp/certificate_chain.h>
#include <dcp/encrypted_kdm.h>
#include "audio_mapping.h"
#include <dcp/name_format.h>
#include <dcp/certificate_chain.h>
#include <dcp/encrypted_kdm.h>
+#include <dcp/language_tag.h>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <vector>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <vector>
@@
-165,10
+164,6
@@
public:
return _show_experimental_audio_processors;
}
return _show_experimental_audio_processors;
}
- ISDCFMetadata default_isdcf_metadata () const {
- return _default_isdcf_metadata;
- }
-
boost::optional<std::string> language () const {
return _language;
}
boost::optional<std::string> language () const {
return _language;
}
@@
-391,6
+386,9
@@
public:
return _jump_to_selected;
}
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,
enum Nag {
NAG_DKDM_CONFIG,
NAG_ENCRYPTED_METADATA,
@@
-399,6
+397,7
@@
public:
NAG_IMPORT_DECRYPTION_CHAIN,
NAG_DELETE_DKDM,
NAG_32_ON_64,
NAG_IMPORT_DECRYPTION_CHAIN,
NAG_DELETE_DKDM,
NAG_32_ON_64,
+ NAG_TOO_MANY_DROPPED_FRAMES,
NAG_COUNT
};
NAG_COUNT
};
@@
-536,8
+535,12
@@
public:
AudioMapping audio_mapping (int output_channels);
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;
+ }
+
+ boost::optional<boost::filesystem::path> add_files_path () const {
+ return _add_files_path;
}
/* SET (mostly) */
}
/* SET (mostly) */
@@
-627,10
+630,6
@@
public:
maybe_set (_show_experimental_audio_processors, e, SHOW_EXPERIMENTAL_AUDIO_PROCESSORS);
}
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;
void set_language (std::string l) {
if (_language && _language.get() == l) {
return;
@@
-1051,8
+1050,11
@@
public:
void set_audio_mapping (AudioMapping m);
void set_audio_mapping_to_default ();
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 set_add_files_path (boost::filesystem::path p) {
+ _add_files_path = p;
+ changed ();
}
void changed (Property p = OTHER);
}
void changed (Property p = OTHER);
@@
-1163,8
+1165,6
@@
private:
bool _allow_any_container;
/** Offer the upmixers in the audio processor settings */
bool _show_experimental_audio_processors;
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;
boost::optional<std::string> _language;
/** Default length of still image content (seconds) */
int _default_still_length;
@@
-1268,7
+1268,8
@@
private:
boost::optional<boost::filesystem::path> _player_playlist_directory;
boost::optional<boost::filesystem::path> _player_kdm_directory;
boost::optional<AudioMapping> _audio_mapping;
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;
+ boost::optional<boost::filesystem::path> _add_files_path;
static int const _current_version;
static int const _current_version;