SOUND,
SOUND_OUTPUT,
INTERFACE_COMPLEXITY,
- PLAYER_DCP_DIRECTORY,
+ PLAYER_CONTENT_DIRECTORY,
+ PLAYER_PLAYLIST_DIRECTORY,
HISTORY,
#ifdef DCPOMATIC_VARIANT_SWAROOP
PLAYER_BACKGROUND_IMAGE,
return _player_log_file;
}
- boost::optional<boost::filesystem::path> player_dcp_directory () const {
- return _player_dcp_directory;
+ boost::optional<boost::filesystem::path> player_content_directory () const {
+ return _player_content_directory;
+ }
+
+ boost::optional<boost::filesystem::path> player_playlist_directory () const {
+ return _player_playlist_directory;
}
boost::optional<boost::filesystem::path> player_kdm_directory () const {
return _required_monitors;
}
- bool allow_spl_editing () const {
- return _allow_spl_editing;
+ boost::optional<boost::filesystem::path> player_lock_file () const {
+ return _player_lock_file;
}
#endif
changed ();
}
- void set_player_dcp_directory (boost::filesystem::path p) {
- maybe_set (_player_dcp_directory, p, PLAYER_DCP_DIRECTORY);
+ void set_player_content_directory (boost::filesystem::path p) {
+ maybe_set (_player_content_directory, p, PLAYER_CONTENT_DIRECTORY);
}
- void unset_player_dcp_directory () {
- if (!_player_dcp_directory) {
+ void unset_player_content_directory () {
+ if (!_player_content_directory) {
return;
}
- _player_dcp_directory = boost::none;
- changed (PLAYER_DCP_DIRECTORY);
+ _player_content_directory = boost::none;
+ changed (PLAYER_CONTENT_DIRECTORY);
+ }
+
+ void set_player_playlist_directory (boost::filesystem::path p) {
+ maybe_set (_player_playlist_directory, p, PLAYER_PLAYLIST_DIRECTORY);
+ }
+
+ void unset_player_playlist_directory () {
+ if (!_player_playlist_directory) {
+ return;
+ }
+ _player_playlist_directory = boost::none;
+ changed (PLAYER_PLAYLIST_DIRECTORY);
}
void set_player_kdm_directory (boost::filesystem::path p) {
maybe_set (_required_monitors, monitors);
}
- void set_allow_spl_editing (bool s) {
- maybe_set (_allow_spl_editing, s);
+ 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
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;
in the dual-screen player mode. DCPs on the list can be loaded
for playback.
*/
- boost::optional<boost::filesystem::path> _player_dcp_directory;
+ boost::optional<boost::filesystem::path> _player_content_directory;
+ boost::optional<boost::filesystem::path> _player_playlist_directory;
boost::optional<boost::filesystem::path> _player_kdm_directory;
#ifdef DCPOMATIC_VARIANT_SWAROOP
boost::optional<boost::filesystem::path> _player_background_image;
/** watermark duration in milliseconds */
int _player_watermark_duration;
std::vector<Monitor> _required_monitors;
- bool _allow_spl_editing;
+ /** 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;