summaryrefslogtreecommitdiff
path: root/src/lib/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/config.h')
-rw-r--r--src/lib/config.h20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/lib/config.h b/src/lib/config.h
index f598ffbc6..e0727fe57 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -108,7 +108,7 @@ public:
SOUND,
SOUND_OUTPUT,
PLAYER_CONTENT_DIRECTORY,
- PLAYER_PLAYLIST_DIRECTORY,
+ SHOW_PLAYLISTS_FILE,
PLAYER_DEBUG_LOG,
HISTORY,
SHOW_EXPERIMENTAL_AUDIO_PROCESSORS,
@@ -580,8 +580,8 @@ public:
return _player_content_directory;
}
- boost::optional<boost::filesystem::path> player_playlist_directory() const {
- return _player_playlist_directory;
+ boost::filesystem::path show_playlists_file() const {
+ return _show_playlists_file;
}
boost::optional<boost::filesystem::path> player_kdm_directory() const {
@@ -1134,16 +1134,8 @@ public:
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_show_playlists_file(boost::filesystem::path p) {
+ maybe_set(_show_playlists_file, p, SHOW_PLAYLISTS_FILE);
}
void set_player_kdm_directory(boost::filesystem::path p) {
@@ -1462,7 +1454,7 @@ private:
for playback.
*/
boost::optional<boost::filesystem::path> _player_content_directory;
- boost::optional<boost::filesystem::path> _player_playlist_directory;
+ boost::filesystem::path _show_playlists_file;
boost::optional<boost::filesystem::path> _player_kdm_directory;
boost::optional<AudioMapping> _audio_mapping;
std::vector<dcp::LanguageTag> _custom_languages;