Fix non-variant build.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 80bb48d32cfb3a15d68acfb786721fca71ba7143..011906a410abf9d1a5477f8a45a54e97c792033e 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -27,6 +27,7 @@
 
 #include "isdcf_metadata.h"
 #include "types.h"
+#include "edid.h"
 #include <dcp/name_format.h>
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
@@ -77,9 +78,9 @@ public:
                SOUND_OUTPUT,
                INTERFACE_COMPLEXITY,
                PLAYER_DCP_DIRECTORY,
+               HISTORY,
 #ifdef DCPOMATIC_VARIANT_SWAROOP
                PLAYER_BACKGROUND_IMAGE,
-               PLAYER_WATERMARK,
 #endif
                OTHER
        };
@@ -503,11 +504,27 @@ public:
                return _kdm_server_url;
        }
 
-       boost::optional<boost::filesystem::path> player_watermark () const {
-               return _player_watermark;
+       std::string player_watermark_theatre () const {
+               return _player_watermark_theatre;
+       }
+
+       int player_watermark_period () const {
+               return _player_watermark_period;
+       }
+
+       int player_watermark_duration () const {
+               return _player_watermark_duration;
+       }
+
+       std::vector<Monitor> required_monitors () const {
+               return _required_monitors;
        }
 #endif
 
+       bool allow_spl_editing () const {
+               return _allow_spl_editing;
+       }
+
        /* SET (mostly) */
 
        void set_master_encoding_threads (int n) {
@@ -971,19 +988,27 @@ public:
                maybe_set (_kdm_server_url, s);
        }
 
-       void set_player_watermark (boost::filesystem::path p) {
-               maybe_set (_player_watermark, p, PLAYER_WATERMARK);
+       void set_player_watermark_theatre (std::string p) {
+               maybe_set (_player_watermark_theatre, p);
        }
 
-       void unset_player_watermark () {
-               if (!_player_watermark) {
-                       return;
-               }
-               _player_watermark = boost::none;
-               changed (PLAYER_WATERMARK);
+       void set_player_watermark_period (int minutes) {
+               maybe_set (_player_watermark_period, minutes);
+       }
+
+       void set_player_watermark_duration (int milliseconds) {
+               maybe_set (_player_watermark_duration, milliseconds);
+       }
+
+       void set_required_monitors (std::vector<Monitor> monitors) {
+               maybe_set (_required_monitors, monitors);
        }
 #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
@@ -1016,13 +1041,13 @@ public:
        static void restore_defaults ();
        static bool have_existing (std::string);
        static boost::filesystem::path config_file ();
+       static boost::filesystem::path path (std::string file, bool create_directories = true);
 
        /** If set, this overrides the standard path (in home, Library, AppData or wherever) for config.xml and cinemas.xml */
        static boost::optional<boost::filesystem::path> override_path;
 
 private:
        Config ();
-       static boost::filesystem::path path (std::string file, bool create_directories = true);
        void read ();
        void set_defaults ();
        void set_kdm_email_to_default ();
@@ -1180,8 +1205,14 @@ private:
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        boost::optional<boost::filesystem::path> _player_background_image;
        std::string _kdm_server_url;
-       boost::optional<boost::filesystem::path> _player_watermark;
+       std::string _player_watermark_theatre;
+       /** watermark period in minutes */
+       int _player_watermark_period;
+       /** watermark duration in milliseconds */
+       int _player_watermark_duration;
+       std::vector<Monitor> _required_monitors;
 #endif
+       bool _allow_spl_editing;
 
        static int const _current_version;