/*
- Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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>
#include <dcp/encrypted_kdm.h>
-#include <boost/shared_ptr.hpp>
+#include <dcp/language_tag.h>
#include <boost/signals2.hpp>
#include <boost/filesystem.hpp>
#include <vector>
DKDM_RECIPIENTS,
SOUND,
SOUND_OUTPUT,
- INTERFACE_COMPLEXITY,
PLAYER_CONTENT_DIRECTORY,
PLAYER_PLAYLIST_DIRECTORY,
PLAYER_DEBUG_LOG,
HISTORY,
SHOW_EXPERIMENTAL_AUDIO_PROCESSORS,
AUDIO_MAPPING,
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- PLAYER_BACKGROUND_IMAGE,
-#endif
OTHER
};
return _tms_password;
}
- std::list<boost::shared_ptr<Cinema> > cinemas () const {
+ std::list<std::shared_ptr<Cinema> > cinemas () const {
return _cinemas;
}
- std::list<boost::shared_ptr<DKDMRecipient> > dkdm_recipients () const {
+ std::list<std::shared_ptr<DKDMRecipient> > dkdm_recipients () const {
return _dkdm_recipients;
}
return _show_experimental_audio_processors;
}
- ISDCFMetadata default_isdcf_metadata () const {
- return _default_isdcf_metadata;
- }
-
boost::optional<std::string> language () const {
return _language;
}
return _dcp_creator;
}
+ std::string dcp_company_name () const {
+ return _dcp_company_name;
+ }
+
+ std::string dcp_product_name () const {
+ return _dcp_product_name;
+ }
+
+ std::string dcp_product_version () const {
+ return _dcp_product_version;
+ }
+
+ std::string dcp_j2k_comment () const {
+ return _dcp_j2k_comment;
+ }
+
int default_j2k_bandwidth () const {
return _default_j2k_bandwidth;
}
return _notification_email;
}
- boost::shared_ptr<const dcp::CertificateChain> signer_chain () const {
+ std::shared_ptr<const dcp::CertificateChain> signer_chain () const {
return _signer_chain;
}
- boost::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
+ std::shared_ptr<const dcp::CertificateChain> decryption_chain () const {
return _decryption_chain;
}
return _player_history;
}
- boost::shared_ptr<DKDMGroup> dkdms () const {
+ std::shared_ptr<DKDMGroup> dkdms () const {
return _dkdms;
}
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,
NAG_ALTER_DECRYPTION_CHAIN,
NAG_BAD_SIGNER_CHAIN,
- /* Not really a nag but it's the same idea */
- NAG_INITIAL_SETUP,
NAG_IMPORT_DECRYPTION_CHAIN,
NAG_DELETE_DKDM,
NAG_32_ON_64,
+ NAG_TOO_MANY_DROPPED_FRAMES,
NAG_COUNT
};
return _gdc_password;
}
- enum Interface {
- INTERFACE_SIMPLE,
- INTERFACE_FULL
- };
-
- Interface interface_complexity () const {
- return _interface_complexity;
- }
-
enum PlayerMode {
PLAYER_MODE_WINDOW, ///< one window containing image and controls
PLAYER_MODE_FULL, ///< just the image filling the screen
AudioMapping audio_mapping (int output_channels);
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- boost::optional<boost::filesystem::path> player_background_image () const {
- return _player_background_image;
+ std::vector<dcp::LanguageTag> custom_languages () const {
+ return _custom_languages;
}
- std::string kdm_server_url () const {
- return _kdm_server_url;
+ boost::optional<boost::filesystem::path> add_files_path () const {
+ return _add_files_path;
}
- std::string player_watermark_theatre () const {
- return _player_watermark_theatre;
- }
-
- int player_watermark_period () const {
- return _player_watermark_period;
- }
-
- int player_watermark_duration () const {
- return _player_watermark_duration;
- }
-
- std::vector<Monitor> required_monitors () const {
- return _required_monitors;
- }
-
- boost::optional<boost::filesystem::path> player_lock_file () const {
- return _player_lock_file;
- }
-#endif
-
/* SET (mostly) */
void set_master_encoding_threads (int n) {
maybe_set (_tms_password, p);
}
- void add_cinema (boost::shared_ptr<Cinema> c) {
+ void add_cinema (std::shared_ptr<Cinema> c) {
_cinemas.push_back (c);
changed (CINEMAS);
}
- void remove_cinema (boost::shared_ptr<Cinema> c) {
+ void remove_cinema (std::shared_ptr<Cinema> c) {
_cinemas.remove (c);
changed (CINEMAS);
}
- void add_dkdm_recipient (boost::shared_ptr<DKDMRecipient> c) {
+ void add_dkdm_recipient (std::shared_ptr<DKDMRecipient> c) {
_dkdm_recipients.push_back (c);
changed (DKDM_RECIPIENTS);
}
- void remove_dkdm_recipient (boost::shared_ptr<DKDMRecipient> c) {
+ void remove_dkdm_recipient (std::shared_ptr<DKDMRecipient> c) {
_dkdm_recipients.remove (c);
changed (DKDM_RECIPIENTS);
}
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;
maybe_set (_dcp_creator, c);
}
+ void set_dcp_company_name (std::string c) {
+ maybe_set (_dcp_company_name, c);
+ }
+
+ void set_dcp_product_name (std::string c) {
+ maybe_set (_dcp_product_name, c);
+ }
+
+ void set_dcp_product_version (std::string c) {
+ maybe_set (_dcp_product_version, c);
+ }
+
+ void set_dcp_j2k_comment (std::string c) {
+ maybe_set (_dcp_j2k_comment, c);
+ }
+
void set_default_j2k_bandwidth (int b) {
maybe_set (_default_j2k_bandwidth, b);
}
void reset_notification_email ();
- void set_signer_chain (boost::shared_ptr<const dcp::CertificateChain> s) {
+ void set_signer_chain (std::shared_ptr<const dcp::CertificateChain> s) {
maybe_set (_signer_chain, s);
}
- void set_decryption_chain (boost::shared_ptr<const dcp::CertificateChain> c) {
+ void set_decryption_chain (std::shared_ptr<const dcp::CertificateChain> c) {
maybe_set (_decryption_chain, c);
}
}
#endif
- void set_dkdms (boost::shared_ptr<DKDMGroup> dkdms) {
+ void set_dkdms (std::shared_ptr<DKDMGroup> dkdms) {
_dkdms = dkdms;
changed ();
}
maybe_set (_gdc_password, boost::optional<std::string>());
}
- void set_interface_complexity (Interface i) {
- maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY);
- }
-
void set_player_mode (PlayerMode m) {
maybe_set (_player_mode, m);
}
void set_audio_mapping (AudioMapping m);
void set_audio_mapping_to_default ();
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- void set_player_background_image (boost::filesystem::path p) {
- maybe_set (_player_background_image, p, PLAYER_BACKGROUND_IMAGE);
- }
-
- void unset_player_background_image () {
- if (!_player_background_image) {
- return;
- }
- _player_background_image = boost::none;
- changed (PLAYER_BACKGROUND_IMAGE);
- }
-
- void set_kdm_server_url (std::string s) {
- maybe_set (_kdm_server_url, s);
- }
+ void add_custom_language (dcp::LanguageTag tag);
- void set_player_watermark_theatre (std::string p) {
- maybe_set (_player_watermark_theatre, p);
- }
-
- void set_player_watermark_period (int minutes) {
- maybe_set (_player_watermark_period, minutes);
- }
-
- void set_player_watermark_duration (int milliseconds) {
- maybe_set (_player_watermark_duration, milliseconds);
- }
-
- void set_required_monitors (std::vector<Monitor> monitors) {
- maybe_set (_required_monitors, monitors);
- }
-
- void set_player_lock_file (boost::filesystem::path p) {
- maybe_set (_player_lock_file, p);
- }
-
- void unset_player_lock_file () {
- if (!_player_lock_file) {
- return;
- }
- _player_lock_file = boost::none;
+ void set_add_files_path (boost::filesystem::path p) {
+ _add_files_path = p;
changed ();
}
-#endif
void changed (Property p = OTHER);
boost::signals2::signal<void (Property)> Changed;
void copy_and_link (boost::filesystem::path new_file) const;
bool have_write_permission () const;
- void save_template (boost::shared_ptr<const Film> film, std::string name) const;
+ void save_template (std::shared_ptr<const Film> film, std::string name) const;
bool existing_template (std::string name) const;
std::list<std::string> templates () const;
boost::filesystem::path template_path (std::string name) const;
void set_cover_sheet_to_default ();
void read_cinemas (cxml::Document const & f);
void read_dkdm_recipients (cxml::Document const & f);
- boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
+ std::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;
void add_to_history_internal (std::vector<boost::filesystem::path>& h, boost::filesystem::path p);
void clean_history_internal (std::vector<boost::filesystem::path>& h);
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;
int _default_dcp_audio_channels;
std::string _dcp_issuer;
std::string _dcp_creator;
+ std::string _dcp_company_name;
+ std::string _dcp_product_name;
+ std::string _dcp_product_version;
+ std::string _dcp_j2k_comment;
int _default_j2k_bandwidth;
int _default_audio_delay;
bool _default_interop;
*/
boost::optional<boost::filesystem::path> _default_kdm_directory;
bool _upload_after_make_dcp;
- std::list<boost::shared_ptr<Cinema> > _cinemas;
- std::list<boost::shared_ptr<DKDMRecipient> > _dkdm_recipients;
+ std::list<std::shared_ptr<Cinema> > _cinemas;
+ std::list<std::shared_ptr<DKDMRecipient> > _dkdm_recipients;
std::string _mail_server;
int _mail_port;
EmailProtocol _mail_protocol;
std::vector<std::string> _notification_cc;
std::string _notification_bcc;
std::string _notification_email;
- boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- boost::filesystem::path _signer_chain_path;
-#endif
+ std::shared_ptr<const dcp::CertificateChain> _signer_chain;
/** Chain used to decrypt KDMs; the leaf of this chain is the target
* certificate for making KDMs given to DCP-o-matic.
*/
- boost::shared_ptr<const dcp::CertificateChain> _decryption_chain;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- boost::filesystem::path _decryption_chain_path;
-#endif
+ std::shared_ptr<const dcp::CertificateChain> _decryption_chain;
/** true to check for updates on startup */
bool _check_for_updates;
bool _check_for_test_updates;
#endif
std::vector<boost::filesystem::path> _history;
std::vector<boost::filesystem::path> _player_history;
- boost::shared_ptr<DKDMGroup> _dkdms;
+ std::shared_ptr<DKDMGroup> _dkdms;
boost::filesystem::path _cinemas_file;
boost::filesystem::path _dkdm_recipients_file;
bool _show_hints_before_make_dcp;
boost::optional<std::string> _christie_password;
boost::optional<std::string> _gdc_username;
boost::optional<std::string> _gdc_password;
- Interface _interface_complexity;
PlayerMode _player_mode;
int _image_display;
VideoViewType _video_view_type;
boost::optional<boost::filesystem::path> _player_playlist_directory;
boost::optional<boost::filesystem::path> _player_kdm_directory;
boost::optional<AudioMapping> _audio_mapping;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
- boost::optional<boost::filesystem::path> _player_background_image;
- std::string _kdm_server_url;
- std::string _player_watermark_theatre;
- /** watermark period in minutes */
- int _player_watermark_period;
- /** watermark duration in milliseconds */
- int _player_watermark_duration;
- std::vector<Monitor> _required_monitors;
- /** a file which, if specified, must be present for the player to work */
- boost::optional<boost::filesystem::path> _player_lock_file;
-#endif
+ std::vector<dcp::LanguageTag> _custom_languages;
+ boost::optional<boost::filesystem::path> _add_files_path;
static int const _current_version;
projects / dcpomatic.git / blobdiff