Tidy up definition of client_receive_ready.

3 files changed, 5 insertions, 21 deletions

diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index 4cc1b7396..e73f0fb0a 100644
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -150,11 +150,7 @@ public:
 			}
 		};
 
-		_messenger = new Messenger(
-			clientReceiveReadySynch,
-			proc,
-			std::thread::hardware_concurrency()
-			);
+		_messenger = new Messenger(proc, std::thread::hardware_concurrency());
 	}
 
 	~GrokContext()
diff --git a/src/lib/grok/messenger.cc b/src/lib/grok/messenger.cc
index cee828434..1940ad889 100644
--- a/src/lib/grok/messenger.cc
+++ b/src/lib/grok/messenger.cc
@@ -31,17 +31,13 @@ auto constexpr CLIENT_SENT = "Global\\client_sent";
 auto constexpr GROK_RECEIVE_READY = "Global\\grok_receive_ready";
 auto constexpr GROK_TO_CLIENT_MESSAGE = "Global\\grok_to_client_message";
 auto constexpr GROK_SENT = "Global\\grok_sent";
+auto constexpr CLIENT_RECEIVE_READY = "Global\\client_receive_ready";
 
 
-Messenger::Messenger(
-	std::string const& inReceiveReady,
-	std::function<void(std::string)> processor,
-	size_t numProcessingThreads
-	)
+Messenger::Messenger(std::function<void(std::string)> processor, size_t numProcessingThreads)
 	: _running(true)
 	, _frames_scheduled(0)
 	, _frames_compressed(0)
-	, _inbound_receive_ready_synch(inReceiveReady)
 	, _processor(processor)
 	, _num_processing_threads(numProcessingThreads)
 	, _uncompressed_frame_size(0)
@@ -182,7 +178,7 @@ Messenger::startThreads()
 	_outbound_synch = new Synch(CLIENT_SENT, GROK_RECEIVE_READY);
 	_outbound = std::thread(&Messenger::outbound_thread, this);
 
-	_inbound_synch = new Synch(GROK_SENT, _inbound_receive_ready_synch.c_str());
+	_inbound_synch = new Synch(GROK_SENT, CLIENT_RECEIVE_READY);
 	_inbound = std::thread(&Messenger::inbound_thread, this);
 
 	for (size_t i = 0; i < _num_processing_threads; ++i) {
diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h
index 20713b726..555c97a40 100644
--- a/src/lib/grok/messenger.h
+++ b/src/lib/grok/messenger.h
@@ -33,7 +33,6 @@
 
 namespace grk_plugin {
 
-static std::string clientReceiveReadySynch = "Global\\client_receive_ready";
 static std::string grokUncompressedBuf = "Global\\grok_uncompressed_buf";
 static std::string grokCompressedBuf = "Global\\grok_compressed_buf";
 static const std::string GRK_MSGR_BATCH_IMAGE = "GRK_MSGR_BATCH_IMAGE";
@@ -303,12 +302,7 @@ private:
 class Messenger
 {
 public:
-	Messenger(
-		std::string const& inReceiveReady,
-		std::function<void(std::string)> processor,
-		size_t numProcessingThreads
-	);
-
+	Messenger(std::function<void(std::string)> processor, size_t numProcessingThreads);
 	~Messenger();
 
 	void startThreads();
@@ -409,8 +403,6 @@ private:
 	std::atomic<uint32_t> _frames_scheduled;
 	std::atomic<uint32_t> _frames_compressed;
 
-	std::string _inbound_receive_ready_synch;
-
 	std::function<void(std::string)> _processor;
 	size_t _num_processing_threads;