Cleanup: whitespace to reduce the diff.

diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index 6b27eb7a83ada16b3105aade317ea8e591c3d593..ecb9d1f98ac3b36e498a6ba46c03321a7183a824 100644 (file)
--- 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 51526aee3a0fc442eb2f66936e4107a9a6f7ef57..eb2fe956045f6593a7e202184cc16032a4d2f639 100644 (file)
--- 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; })) {