Cleanup: coding style.

3 files changed, 30 insertions, 13 deletions

diff --git a/src/lib/grok/context.h b/src/lib/grok/context.h
index 05343f01b..520cc0a1e 100644
--- a/src/lib/grok/context.h
+++ b/src/lib/grok/context.h
@@ -248,7 +248,7 @@ public:
 		}
 
 		auto cvt = [&vf](BufferSrc src) {
-			vf.convert_to_xyz((uint16_t*)src.framePtr_);
+			vf.convert_to_xyz((uint16_t*) src.frame_ptr);
 		};
 
 		return _messenger->schedule_compress(vf, cvt);
diff --git a/src/lib/grok/messenger.cc b/src/lib/grok/messenger.cc
index 423356cb3..eb9e208fc 100644
--- a/src/lib/grok/messenger.cc
+++ b/src/lib/grok/messenger.cc
@@ -403,7 +403,7 @@ Messenger::schedule_compress(DCPVideo const& proxy, std::function<void(BufferSrc
 	converter(src);
 	_scheduled_frames.store(proxy);
 	_frames_scheduled++;
-	send(GRK_MSGR_BATCH_SUBMIT_UNCOMPRESSED, proxy.index(), src.frameId_);
+	send(GRK_MSGR_BATCH_SUBMIT_UNCOMPRESSED, proxy.index(), src.frame_id);
 
 	return true;
 }
diff --git a/src/lib/grok/messenger.h b/src/lib/grok/messenger.h
index 98e1a0b48..fee5295ae 100644
--- a/src/lib/grok/messenger.h
+++ b/src/lib/grok/messenger.h
@@ -319,26 +319,43 @@ class MessengerBlockingQueue
 	bool active_;
 	size_t max_size_;
 };
+
+
 struct BufferSrc
 {
-	BufferSrc(void) : BufferSrc("") {}
-	explicit BufferSrc(const std::string &file) : file_(file), clientFrameId_(0), frameId_(0), framePtr_(nullptr)
+public:
+	BufferSrc()
+		: BufferSrc("")
 	{}
-	BufferSrc(size_t clientFrameId, size_t frameId, uint8_t* framePtr)
-		: file_(""), clientFrameId_(clientFrameId), frameId_(frameId), framePtr_(framePtr)
+
+	explicit BufferSrc(std::string const& file)
+		: _file(file)
+		, _client_frame_id(0)
+	{}
+
+	BufferSrc(size_t client_frame_id, size_t frame_id_, uint8_t* frame_ptr_)
+		: frame_id(frame_id_)
+		, frame_ptr(frame_ptr_)
+		, _file("")
+		, _client_frame_id(client_frame_id)
 	{}
-	bool fromDisk(void)
+
+	bool from_disk()
 	{
-		return !file_.empty() && framePtr_ == nullptr;
+		return !_file.empty() && frame_ptr == nullptr;
 	}
+
 	size_t index() const
 	{
-		return clientFrameId_;
+		return _client_frame_id;
 	}
-	std::string file_;
-	size_t clientFrameId_;
-	size_t frameId_;
-	uint8_t* framePtr_;
+
+	size_t frame_id = 0;
+	uint8_t* frame_ptr = nullptr;
+
+private:
+	std::string _file;
+	size_t _client_frame_id;
 };