diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-11-28 19:24:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-11-29 23:32:32 +0100 |
| commit | db53687617961f5ae0c68d630472f2d9d927b4d4 (patch) | |
| tree | 0f1e2eaae58bd7252a28acc417ba227145d61cc3 /src/lib | |
| parent | f620b345e313b8195ffd631bb4af80b003bfba29 (diff) | |
Remove config of grok server port (#2900).
The server now always uses port 80.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 2 | ||||
| -rw-r--r-- | src/lib/config.h | 1 | ||||
| -rw-r--r-- | src/lib/grok/context.h | 1 | ||||
| -rw-r--r-- | src/lib/grok/messenger.h | 5 |
4 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index cd285abd1..2787b2de2 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1747,7 +1747,6 @@ Config::Grok::Grok(cxml::ConstNodePtr node) , binary_location(node->string_child("BinaryLocation")) , selected(node->number_child<int>("Selected")) , licence_server(node->string_child("LicenceServer")) - , licence_port(node->number_child<int>("LicencePort")) , licence(node->string_child("Licence")) { @@ -1761,7 +1760,6 @@ Config::Grok::as_xml(xmlpp::Element* node) const node->add_child("Enable")->add_child_text((enable ? "1" : "0")); node->add_child("Selected")->add_child_text(raw_convert<string>(selected)); node->add_child("LicenceServer")->add_child_text(licence_server); - node->add_child("LicencePort")->add_child_text(raw_convert<string>(licence_port)); node->add_child("Licence")->add_child_text(licence); } diff --git a/src/lib/config.h b/src/lib/config.h index 52fe47b3f..45ac7ffb8 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -657,7 +657,6 @@ public: boost::filesystem::path binary_location; int selected = 0; std::string licence_server; - int licence_port = 5000; std::string licence; }; diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h index 70181466b..602c8b13f 100644 --- a/src/lib/grok/context.h +++ b/src/lib/grok/context.h @@ -229,7 +229,6 @@ public: _dcpomatic_context->film->video_frame_rate(), _dcpomatic_context->film->video_bit_rate(VideoEncoding::JPEG2000), grok.licence_server, - grok.licence_port, grok.licence)) { _launch_failed = true; return false; diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h index 89205d0a8..608462b0e 100644 --- a/src/lib/grok/messenger.h +++ b/src/lib/grok/messenger.h @@ -542,11 +542,9 @@ struct Messenger uint32_t fps, uint32_t bandwidth, const std::string server, - uint32_t port, const std::string license ) { - std::unique_lock<std::mutex> lk(shutdownMutex_); if (async_result_.valid()) { return true; @@ -555,14 +553,13 @@ struct Messenger init_.unlink(); } startThreads(); - auto fullServer = server + ":" + std::to_string(port); char cmd[4096]; snprintf(cmd, sizeof(cmd), "./grk_compress -batch_src %s,%d,%d,%d,%d,%d -out_fmt j2k -k 1 " "-G %d -%s %d,%d -j %s -J %s -v", GRK_MSGR_BATCH_IMAGE.c_str(), width, stride, height, samplesPerPixel, depth, device, is4K ? "cinema4K" : "cinema2K", fps, bandwidth, - license.c_str(), fullServer.c_str()); + license.c_str(), server.c_str()); return launch(cmd, dir); } |