projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Player log file -> player activity log file.
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index dd20b58e7d66974a1d7435dafb760ee68144886f..5ae14ebda03384f8250f3ad12d4085fd4025aa62 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-484,8
+484,8
@@
public:
return _respect_kdm_validity_periods;
}
return _respect_kdm_validity_periods;
}
- boost::optional<boost::filesystem::path> player_log_file () const {
- return _player_log_file;
+ boost::optional<boost::filesystem::path> player_
activity_
log_file () const {
+ return _player_
activity_
log_file;
}
boost::optional<boost::filesystem::path> player_content_directory () const {
}
boost::optional<boost::filesystem::path> player_content_directory () const {
@@
-530,10
+530,6
@@
public:
}
#endif
}
#endif
- bool allow_spl_editing () const {
- return _allow_spl_editing;
- }
-
/* SET (mostly) */
void set_master_encoding_threads (int n) {
/* SET (mostly) */
void set_master_encoding_threads (int n) {
@@
-944,15
+940,15
@@
public:
maybe_set (_respect_kdm_validity_periods, r);
}
maybe_set (_respect_kdm_validity_periods, r);
}
- void set_player_log_file (boost::filesystem::path p) {
- maybe_set (_player_log_file, p);
+ void set_player_
activity_
log_file (boost::filesystem::path p) {
+ maybe_set (_player_
activity_
log_file, p);
}
}
- void unset_player_log_file () {
- if (!_player_log_file) {
+ void unset_player_
activity_
log_file () {
+ if (!_player_
activity_
log_file) {
return;
}
return;
}
- _player_log_file = boost::none;
+ _player_
activity_
log_file = boost::none;
changed ();
}
changed ();
}
@@
-1038,10
+1034,6
@@
public:
}
#endif
}
#endif
- void set_allow_spl_editing (bool s) {
- maybe_set (_allow_spl_editing, s);
- }
-
void changed (Property p = OTHER);
boost::signals2::signal<void (Property)> Changed;
/** Emitted if read() failed on an existing Config file. There is nothing
void changed (Property p = OTHER);
boost::signals2::signal<void (Property)> Changed;
/** Emitted if read() failed on an existing Config file. There is nothing
@@
-1136,6
+1128,7
@@
private:
std::string _tms_password;
/** Our cinema sound processor */
CinemaSoundProcessor const * _cinema_sound_processor;
std::string _tms_password;
/** Our cinema sound processor */
CinemaSoundProcessor const * _cinema_sound_processor;
+ /** The list of possible DCP frame rates that DCP-o-matic will use */
std::list<int> _allowed_dcp_frame_rates;
/** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
bool _allow_any_dcp_frame_rate;
std::list<int> _allowed_dcp_frame_rates;
/** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
bool _allow_any_dcp_frame_rate;
@@
-1180,10
+1173,16
@@
private:
std::string _notification_bcc;
std::string _notification_email;
boost::shared_ptr<const dcp::CertificateChain> _signer_chain;
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;
/** 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;
/** true to check for updates on startup */
bool _check_for_updates;
bool _check_for_test_updates;
@@
-1228,7
+1227,10
@@
private:
PlayerMode _player_mode;
int _image_display;
bool _respect_kdm_validity_periods;
PlayerMode _player_mode;
int _image_display;
bool _respect_kdm_validity_periods;
- boost::optional<boost::filesystem::path> _player_log_file;
+ /** Log file containing things the player does (e.g. started, stopped, loaded
+ playlist etc.) Does not contain debugging information.
+ */
+ boost::optional<boost::filesystem::path> _player_activity_log_file;
/** A directory containing DCPs whose contents are presented to the user
in the dual-screen player mode. DCPs on the list can be loaded
for playback.
/** A directory containing DCPs whose contents are presented to the user
in the dual-screen player mode. DCPs on the list can be loaded
for playback.
@@
-1248,7
+1250,6
@@
private:
/** a file which, if specified, must be present for the player to work */
boost::optional<boost::filesystem::path> _player_lock_file;
#endif
/** a file which, if specified, must be present for the player to work */
boost::optional<boost::filesystem::path> _player_lock_file;
#endif
- bool _allow_spl_editing;
static int const _current_version;
static int const _current_version;