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 _default_container;
}
- Ratio const * default_scale_to () const {
- return _default_scale_to;
- }
-
DCPContentType const * default_dcp_content_type () const {
return _default_dcp_content_type;
}
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 _default_interop;
}
- bool default_upload_after_make_dcp () {
- return _default_upload_after_make_dcp;
+ bool upload_after_make_dcp () {
+ return _upload_after_make_dcp;
}
void set_default_kdm_directory (boost::filesystem::path d) {
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,
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::string kdm_server_url () const {
- return _kdm_server_url;
- }
-
- 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 (_default_container, c);
}
- void set_default_scale_to (Ratio const * c) {
- maybe_set (_default_scale_to, c);
- }
-
void set_default_dcp_content_type (DCPContentType const * t) {
maybe_set (_default_dcp_content_type, t);
}
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);
}
maybe_set (_default_interop, i);
}
- void set_default_upload_after_make_dcp (bool u) {
- maybe_set (_default_upload_after_make_dcp, u);
+ void set_upload_after_make_dcp (bool u) {
+ maybe_set (_upload_after_make_dcp, u);
}
void set_mail_server (std::string s) {
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 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;
- changed ();
- }
-#endif
-
void changed (Property p = OTHER);
boost::signals2::signal<void (Property)> Changed;
/** Emitted if read() failed on an existing Config file. There is nothing
/** Default length of still image content (seconds) */
int _default_still_length;
Ratio const * _default_container;
- Ratio const * _default_scale_to;
DCPContentType const * _default_dcp_content_type;
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;
the home directory will be offered.
*/
boost::optional<boost::filesystem::path> _default_kdm_directory;
- bool _default_upload_after_make_dcp;
+ bool _upload_after_make_dcp;
std::list<boost::shared_ptr<Cinema> > _cinemas;
std::list<boost::shared_ptr<DKDMRecipient> > _dkdm_recipients;
std::string _mail_server;
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
/** 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
/** true to check for updates on startup */
bool _check_for_updates;
bool _check_for_test_updates;
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
static int const _current_version;
projects / dcpomatic.git / blobdiff