Add player DCP directory to config.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index e5d241d2b97bc5e2d4cbdeaa97c1c972a6cd505d..54716d8497afcc75ec4ee57cb30a3f423ee07c39 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -167,6 +167,7 @@ Config::set_defaults ()
        _image_display = 0;
        _respect_kdm_validity_periods = true;
        _player_log_file = boost::none;
+       _player_dcp_directory = boost::none;
 
        _allowed_dcp_frame_rates.clear ();
        _allowed_dcp_frame_rates.push_back (24);
@@ -497,6 +498,7 @@ try
        _image_display = f.optional_number_child<int>("ImageDisplay").get_value_or(0);
        _respect_kdm_validity_periods = f.optional_bool_child("RespectKDMValidityPeriods").get_value_or(true);
        _player_log_file = f.optional_string_child("PlayerLogFile");
+       _player_dcp_directory = f.optional_string_child("PlayerDCPDirectory");
 
        /* Replace any cinemas from config.xml with those from the configured file */
        if (boost::filesystem::exists (_cinemas_file)) {
@@ -888,6 +890,9 @@ Config::write_config () const
        if (_player_log_file) {
                root->add_child("PlayerLogFile")->add_child_text(_player_log_file->string());
        }
+       if (_player_dcp_directory) {
+               root->add_child("PlayerDCPDirectory")->add_child_text(_player_dcp_directory->string());
+       }
 
        try {
                doc.write_to_file_formatted(config_file().string());

diff --git a/src/lib/config.h b/src/lib/config.h
index 02295725b36cfd58c1a31bf32d8115b6426b654f..fc5d820f93f663d677c57b080f4052e646e1b3fa 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -481,6 +481,10 @@ public:
                return _player_log_file;
        }
 
+       boost::optional<boost::filesystem::path> player_dcp_directory () const {
+               return _player_dcp_directory;
+       }
+
        /* SET (mostly) */
 
        void set_master_encoding_threads (int n) {
@@ -903,6 +907,18 @@ public:
                changed ();
        }
 
+       void set_player_dcp_directory (boost::filesystem::path p) {
+               maybe_set (_player_dcp_directory, p);
+       }
+
+       void unset_player_dcp_directory () {
+               if (!_player_dcp_directory) {
+                       return;
+               }
+               _player_dcp_directory = boost::none;
+               changed ();
+       }
+
        void changed (Property p = OTHER);
        boost::signals2::signal<void (Property)> Changed;
        /** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1089,6 +1105,11 @@ private:
        int _image_display;
        bool _respect_kdm_validity_periods;
        boost::optional<boost::filesystem::path> _player_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.
+       */
+       boost::optional<boost::filesystem::path> _player_dcp_directory;
 
        static int const _current_version;