Add default grok licence server.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2787b2de25108ba0badd7737c7cd5beb63473b7d..0cbf1fcb67c87948136643a592e4ab9d89ab9876 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -73,6 +73,10 @@ boost::signals2::signal<void (Config::LoadFailure)> Config::FailedToLoad;
 boost::signals2::signal<void (string)> Config::Warning;
 boost::signals2::signal<bool (Config::BadReason)> Config::Bad;
 
+#ifdef DCPOMATIC_GROK
+auto constexpr default_grok_licence_server = "https://grokcompression.com/api/register";
+#endif
+
 
 /** Construct default configuration */
 Config::Config ()
@@ -1742,6 +1746,11 @@ Config::cinemas_file_from_zip(boost::filesystem::path zip)
 
 #ifdef DCPOMATIC_GROK
 
+Config::Grok::Grok()
+       : licence_server(default_grok_licence_server)
+{}
+
+
 Config::Grok::Grok(cxml::ConstNodePtr node)
        : enable(node->bool_child("Enable"))
        , binary_location(node->string_child("BinaryLocation"))
@@ -1749,7 +1758,9 @@ Config::Grok::Grok(cxml::ConstNodePtr node)
        , licence_server(node->string_child("LicenceServer"))
        , licence(node->string_child("Licence"))
 {
-
+       if (licence_server.empty()) {
+               licence_server = default_grok_licence_server;
+       }
 }
 
 

diff --git a/src/lib/config.h b/src/lib/config.h
index 45ac7ffb89c910210888352a30811a9e4f03a5d1..794e39ec735d9881f982b3e6b9f240c007a1b6db 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -648,7 +648,7 @@ public:
        class Grok
        {
        public:
-               Grok() = default;
+               Grok();
                Grok(cxml::ConstNodePtr node);
 
                void as_xml(xmlpp::Element* node) const;