Remove player activity logging. Fixes #2122.

[dcpomatic.git] / src / lib / config.h

diff --git a/src/lib/config.h b/src/lib/config.h
index eb8f88da9566f061e70ccf5e87ebbcfd11ab5279..215e6a4dbcbe33caf7680a3243021f727f513ae9 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,7 +27,6 @@
 
 #include "types.h"
 #include "state.h"
-#include "edid.h"
 #include "audio_mapping.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
@@ -141,11 +140,11 @@ public:
                return _tms_password;
        }
 
-       std::list<std::shared_ptr<Cinema> > cinemas () const {
+       std::list<std::shared_ptr<Cinema>> cinemas () const {
                return _cinemas;
        }
 
-       std::list<std::shared_ptr<DKDMRecipient> > dkdm_recipients () const {
+       std::list<std::shared_ptr<DKDMRecipient>> dkdm_recipients () const {
                return _dkdm_recipients;
        }
 
@@ -221,6 +220,10 @@ public:
                return _default_interop;
        }
 
+       std::map<std::string, std::string> default_metadata () const {
+               return _default_metadata;
+       }
+
        bool upload_after_make_dcp () {
                return _upload_after_make_dcp;
        }
@@ -514,10 +517,6 @@ public:
                return _respect_kdm_validity_periods;
        }
 
-       boost::optional<boost::filesystem::path> player_activity_log_file () const {
-               return _player_activity_log_file;
-       }
-
        boost::optional<boost::filesystem::path> player_debug_log_file () const {
                return _player_debug_log_file;
        }
@@ -536,14 +535,14 @@ public:
 
        AudioMapping audio_mapping (int output_channels);
 
-       int minimum_frame_size () const {
-               return _minimum_frame_size;
-       }
-
        std::vector<dcp::LanguageTag> custom_languages () const {
                return _custom_languages;
        }
 
+       boost::optional<boost::filesystem::path> add_files_path () const {
+               return _add_files_path;
+       }
+
        /* SET (mostly) */
 
        void set_master_encoding_threads (int n) {
@@ -700,6 +699,10 @@ public:
                maybe_set (_default_interop, i);
        }
 
+       void set_default_metadata (std::map<std::string, std::string> const& metadata) {
+               maybe_set (_default_metadata, metadata);
+       }
+
        void set_upload_after_make_dcp (bool u) {
                maybe_set (_upload_after_make_dcp, u);
        }
@@ -820,8 +823,6 @@ public:
 
        void set_cinemas_file (boost::filesystem::path file);
 
-       void set_dkdm_recipients_file (boost::filesystem::path file);
-
        void set_show_hints_before_make_dcp (bool s) {
                maybe_set (_show_hints_before_make_dcp, s);
        }
@@ -988,18 +989,6 @@ public:
                maybe_set (_respect_kdm_validity_periods, r);
        }
 
-       void set_player_activity_log_file (boost::filesystem::path p) {
-               maybe_set (_player_activity_log_file, p);
-       }
-
-       void unset_player_activity_log_file () {
-               if (!_player_activity_log_file) {
-                       return;
-               }
-               _player_activity_log_file = boost::none;
-               changed ();
-       }
-
        void set_player_debug_log_file (boost::filesystem::path p) {
                maybe_set (_player_debug_log_file, p, PLAYER_DEBUG_LOG);
        }
@@ -1051,12 +1040,13 @@ public:
        void set_audio_mapping (AudioMapping m);
        void set_audio_mapping_to_default ();
 
-       void set_minimum_frame_size (int size) {
-               maybe_set (_minimum_frame_size, size);
-       }
-
        void add_custom_language (dcp::LanguageTag tag);
 
+       void set_add_files_path (boost::filesystem::path p) {
+               _add_files_path = p;
+               changed ();
+       }
+
        void changed (Property p = OTHER);
        boost::signals2::signal<void (Property)> Changed;
        /** Emitted if read() failed on an existing Config file.  There is nothing
@@ -1087,7 +1077,8 @@ public:
        void save_template (std::shared_ptr<const Film> film, std::string name) const;
        bool existing_template (std::string name) const;
        std::list<std::string> templates () const;
-       boost::filesystem::path template_path (std::string name) const;
+       boost::filesystem::path template_read_path (std::string name) const;
+       boost::filesystem::path template_write_path (std::string name) const;
        void rename_template (std::string old_name, std::string new_name) const;
        void delete_template (std::string name) const;
 
@@ -1095,7 +1086,8 @@ public:
        static void drop ();
        static void restore_defaults ();
        static bool have_existing (std::string);
-       static boost::filesystem::path config_file ();
+       static boost::filesystem::path config_read_file ();
+       static boost::filesystem::path config_write_file ();
 
 private:
        Config ();
@@ -1180,13 +1172,14 @@ private:
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        bool _default_interop;
+       std::map<std::string, std::string> _default_metadata;
        /** Default directory to offer to write KDMs to; if it's not set,
            the home directory will be offered.
        */
        boost::optional<boost::filesystem::path> _default_kdm_directory;
        bool _upload_after_make_dcp;
-       std::list<std::shared_ptr<Cinema> > _cinemas;
-       std::list<std::shared_ptr<DKDMRecipient> > _dkdm_recipients;
+       std::list<std::shared_ptr<Cinema>> _cinemas;
+       std::list<std::shared_ptr<DKDMRecipient>> _dkdm_recipients;
        std::string _mail_server;
        int _mail_port;
        EmailProtocol _mail_protocol;
@@ -1254,10 +1247,6 @@ private:
        int _image_display;
        VideoViewType _video_view_type;
        bool _respect_kdm_validity_periods;
-       /** 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;
        /** Log file containing debug information for the player */
        boost::optional<boost::filesystem::path> _player_debug_log_file;
        /** A directory containing DCPs whose contents are presented to the user
@@ -1268,8 +1257,8 @@ private:
        boost::optional<boost::filesystem::path> _player_playlist_directory;
        boost::optional<boost::filesystem::path> _player_kdm_directory;
        boost::optional<AudioMapping> _audio_mapping;
-       int _minimum_frame_size;
        std::vector<dcp::LanguageTag> _custom_languages;
+       boost::optional<boost::filesystem::path> _add_files_path;
 
        static int const _current_version;