diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-07-07 21:26:54 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-07-07 21:26:54 +0200 |
| commit | f4370a5cb2d085a9a2f6396b9b6eec2cb9bdedbb (patch) | |
| tree | 54dda343720e7588d68c7139c28692099e36c0b4 | |
| parent | 3e7540182e9549b1f64a0129700a297b66b21cf0 (diff) | |
Whitespace tweaks.
| -rw-r--r-- | src/lib/grok_context.cc | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/src/lib/grok_context.cc b/src/lib/grok_context.cc index b13ab083e..14df64c15 100644 --- a/src/lib/grok_context.cc +++ b/src/lib/grok_context.cc @@ -151,8 +151,7 @@ GrokContext::GrokContext(const DcpomaticContext& dcpomaticContext) boost::filesystem::path folder(*_dcpomatic_context.location); boost::filesystem::path binaryPath = folder / "grk_compress"; if (!boost::filesystem::exists(binaryPath)) { - get_messenger_logger()->error("Invalid binary location %s", - _dcpomatic_context.location->c_str()); + get_messenger_logger()->error("Invalid binary location %s", _dcpomatic_context.location->c_str()); return; } auto proc = [this](const std::string& str) { @@ -190,10 +189,16 @@ GrokContext::GrokContext(const DcpomaticContext& dcpomaticContext) get_messenger_logger()->error("%s", ex.what()); } }; - auto clientInit = - MessengerInit(clientToGrokMessageBuf, clientSentSynch, grokReceiveReadySynch, - grokToClientMessageBuf, grokSentSynch, clientReceiveReadySynch, proc, - std::thread::hardware_concurrency()); + auto clientInit = MessengerInit( + clientToGrokMessageBuf, + clientSentSynch, + grokReceiveReadySynch, + grokToClientMessageBuf, + grokSentSynch, + clientReceiveReadySynch, + proc, + std::thread::hardware_concurrency() + ); _messenger = new ScheduledMessenger<FrameProxy>(clientInit); } } @@ -228,16 +233,21 @@ GrokContext::launch(DCPVideo dcpv, int device) DCPOMATIC_ASSERT(_dcpomatic_context.location); DCPOMATIC_ASSERT(config->gpu_license_server()); DCPOMATIC_ASSERT(config->gpu_license()); - _messenger->launch_grok(*_dcpomatic_context.location, - _dcpomatic_context.width, _dcpomatic_context.width, - _dcpomatic_context.height, - 3, 12, device, - _dcpomatic_context.film->resolution() == Resolution::FOUR_K, - _dcpomatic_context.film->video_frame_rate(), - _dcpomatic_context.film->j2k_bandwidth(), - *config->gpu_license_server(), - config->gpu_license_port(), - *config->gpu_license()); + _messenger->launch_grok( + *_dcpomatic_context.location, + _dcpomatic_context.width, + _dcpomatic_context.width, + _dcpomatic_context.height, + 3, + 12, + device, + _dcpomatic_context.film->resolution() == Resolution::FOUR_K, + _dcpomatic_context.film->video_frame_rate(), + _dcpomatic_context.film->j2k_bandwidth(), + *config->gpu_license_server(), + config->gpu_license_port(), + *config->gpu_license() + ); } _launched = _messenger->wait_for_client_init(); |
