diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-12-04 21:53:43 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-12-04 21:53:43 +0100 |
| commit | 29dd4c4d2f40527f2b7e2f4d819274f1a39204c7 (patch) | |
| tree | 3ffcbd584779c780ffa45bf89f8b51d1e13c7203 | |
| parent | 5db5da477ce02166481d79df322bbfb7abc8f24c (diff) | |
Add default grok licence server.
| -rw-r--r-- | src/lib/config.cc | 13 | ||||
| -rw-r--r-- | src/lib/config.h | 2 |
2 files changed, 13 insertions, 2 deletions
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<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 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; |
