diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-04 19:51:54 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-12-16 02:07:38 +0100 |
| commit | 25b683b414af85dbed22c465002104a226c622e9 (patch) | |
| tree | 60f86c61e38b232cf26a6f9d3d2afea9626cfe00 | |
| parent | ff2070a05a9b6865815b27c3000d11a750188afa (diff) | |
Cleanup: whitespace to reduce the diff.
| -rw-r--r-- | src/lib/grok/context.h | 13 | ||||
| -rw-r--r-- | src/lib/grok/messenger.h | 11 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h index 6b27eb7a8..ecb9d1f98 100644 --- a/src/lib/grok/context.h +++ b/src/lib/grok/context.h @@ -108,11 +108,11 @@ struct DcpomaticContext { class GrokContext { public: - explicit GrokContext(DcpomaticContext* dcpomatic_context) : - _dcpomatic_context(dcpomatic_context), - messenger_(nullptr), - launched_(false), - launchFailed_(false) + explicit GrokContext(DcpomaticContext* dcpomatic_context) + : _dcpomatic_context(dcpomatic_context) + , messenger_(nullptr) + , launched_(false) + , launchFailed_(false) { if (Config::instance()->enable_gpu ()) { boost::filesystem::path folder(_dcpomatic_context->_location); @@ -193,7 +193,8 @@ public: auto s = dcpv.get_size(); _dcpomatic_context->setDimensions(s.width, s.height); auto config = Config::instance(); - if (!messenger_->launchGrok(_dcpomatic_context->_location, + if (!messenger_->launchGrok( + _dcpomatic_context->_location, _dcpomatic_context->width_,_dcpomatic_context->width_, _dcpomatic_context->height_, 3, 12, device, diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h index 51526aee3..eb2fe9560 100644 --- a/src/lib/grok/messenger.h +++ b/src/lib/grok/messenger.h @@ -585,16 +585,19 @@ struct Messenger bool waitForClientInit() { - if(_initialized) + if (_initialized) { return true; - else if (_shutdown) + } else if (_shutdown) { return false; + } std::unique_lock<std::mutex> lk(shutdownMutex_); - if(_initialized) + + if (_initialized) { return true; - else if (_shutdown) + } else if (_shutdown) { return false; + } while (true) { if (clientInitializedCondition_.wait_for(lk, std::chrono::seconds(1), [this]{ return _initialized || _shutdown; })) { |