From 29dd4c4d2f40527f2b7e2f4d819274f1a39204c7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 4 Dec 2024 21:53:43 +0100 Subject: Add default grok licence server. --- src/lib/config.cc | 13 ++++++++++++- src/lib/config.h | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/config.cc b/src/lib/config.cc index 2787b2de2..0cbf1fcb6 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -73,6 +73,10 @@ boost::signals2::signal Config::FailedToLoad; boost::signals2::signal Config::Warning; boost::signals2::signal 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 45ac7ffb8..794e39ec7 100644 --- 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; -- cgit v1.2.3