refactor

Artikash · Dec 14, 2018 · dfb45a3 · dfb45a3
1 parent a3ac850
commit dfb45a3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/GUI/host/textthread.cpp b/GUI/host/textthread.cpp
@@ -4,13 +4,13 @@
 #include "host.h"
 #include "util.h"
 
-TextThread::TextThread(ThreadParam tp, HookParam hp, std::optional<std::wstring> name) : 
-	handle(threadCounter++), 
-	name(name.value_or(Util::StringToWideString(hp.name).value())), 
-	tp(tp), 
+TextThread::TextThread(ThreadParam tp, HookParam hp, std::optional<std::wstring> name) :
+	handle(threadCounter++),
+	name(name.value_or(Util::StringToWideString(hp.name).value())),
+	tp(tp),
 	hp(hp)
 {
-	CreateTimerQueueTimer(timer, NULL, Flush, this, 25, 25, WT_EXECUTELONGFUNCTION);
+	CreateTimerQueueTimer(timer, NULL, [](void* This, BOOLEAN) { ((TextThread*)This)->Flush(); }, this, 25, 25, WT_EXECUTELONGFUNCTION);
 	OnCreate(this);
 }
 
@@ -40,19 +40,18 @@ void TextThread::Push(const BYTE* data, int len)
 	lastPushTime = GetTickCount();
 }
 
-void CALLBACK Flush(void* thread, BOOLEAN)
+void TextThread::Flush()
 {
-	auto This = (TextThread*)thread;
 	std::wstring sentence;
 	{
-		LOCK(This->bufferMutex);
-		if (This->buffer.empty()) return;
-		if (This->buffer.size() < This->maxBufferSize && GetTickCount() - This->lastPushTime < This->flushDelay) return;
-		sentence = This->buffer;
-		This->buffer.clear();
+		LOCK(bufferMutex);
+		if (buffer.empty()) return;
+		if (buffer.size() < maxBufferSize && GetTickCount() - lastPushTime < flushDelay) return;
+		sentence = buffer;
+		buffer.clear();
 
-		if (Util::RemoveRepetition(sentence)) This->repeatingChars = std::unordered_set(sentence.begin(), sentence.end());
-		else This->repeatingChars.clear();
+		if (Util::RemoveRepetition(sentence)) repeatingChars = std::unordered_set(sentence.begin(), sentence.end());
+		else repeatingChars.clear();
 	}
-	This->AddSentence(sentence);
+	AddSentence(sentence);
 }
diff --git a/GUI/host/textthread.h b/GUI/host/textthread.h
@@ -22,16 +22,16 @@ class TextThread
 	std::wstring GetStorage();
 	void AddSentence(std::wstring sentence);
 	void Push(const BYTE* data, int len);
-	friend void CALLBACK Flush(void* thread, BOOLEAN);
 
 	const int64_t handle;
 	const std::wstring name;
 	const ThreadParam tp;
 	const HookParam hp;
 
 private:
-	struct TimerDeleter { void operator()(void* h) { DeleteTimerQueueTimer(NULL, h, INVALID_HANDLE_VALUE); } };
+	void Flush();
 
+	struct TimerDeleter { void operator()(void* h) { DeleteTimerQueueTimer(NULL, h, INVALID_HANDLE_VALUE); } };
 	ThreadSafePtr<std::wstring> storage;
 	std::wstring buffer;
 	std::unordered_set<wchar_t> repeatingChars;