From c4942da235151166e7ada2925c83539a5f5fde46 Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Sat, 28 Apr 2018 12:45:11 +0200
Subject: [PATCH] source-mirror: Refactoring

---
 source/source-mirror.cpp | 16 ++++++++--------
 source/source-mirror.h   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/source-mirror.cpp b/source/source-mirror.cpp
index 43fac6a3..d276a364 100644
--- a/source/source-mirror.cpp
+++ b/source/source-mirror.cpp
@@ -251,7 +251,7 @@ Source::Mirror::Mirror(obs_data_t* data, obs_source_t* src) {
 }
 
 Source::Mirror::~Mirror() {
-	m_audioKill = true;
+	m_killAudioThread = true;
 	m_audioNotify.notify_all();
 	if (m_audioThread.joinable())
 		m_audioThread.join();
@@ -281,8 +281,8 @@ void Source::Mirror::update(obs_data_t* data) {
 	if (sourceName != m_mirrorName) {
 		try {
 			m_mirrorSource = std::make_unique<gfx::source_texture>(sourceName, m_source);
-			m_mirrorAudio = std::make_unique<obs::audio_capture>(m_mirrorSource->get_object());
-			m_mirrorAudio->set_callback(std::bind(&Source::Mirror::audio_capture_cb, this,
+			m_audioCapture = std::make_unique<obs::audio_capture>(m_mirrorSource->get_object());
+			m_audioCapture->set_callback(std::bind(&Source::Mirror::audio_capture_cb, this,
 				std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 			m_mirrorName = sourceName;
 		} catch (...) {
@@ -471,19 +471,19 @@ void Source::Mirror::audio_capture_cb(void* data, const audio_data* audio, bool
 	m_audioOutput.samples_per_sec = aoi->samples_per_sec;
 	m_audioOutput.speakers = aoi->speakers;
 
-	m_audioExists = true;
+	m_haveAudioOutput = true;
 	m_audioNotify.notify_all();
 }
 
 void Source::Mirror::audio_output_cb() {
 	std::unique_lock<std::mutex> ulock(m_audioLock);
 
-	while (!m_audioKill) {
-		if (m_audioExists) {
+	while (!m_killAudioThread) {
+		if (m_haveAudioOutput) {
 			obs_source_output_audio(m_source, &m_audioOutput);
-			m_audioExists = false;
+			m_haveAudioOutput = false;
 		}
-		m_audioNotify.wait(ulock, [this]() { return m_audioExists || m_audioKill; });
+		m_audioNotify.wait(ulock, [this]() { return m_haveAudioOutput || m_killAudioThread; });
 	}
 }
 
diff --git a/source/source-mirror.h b/source/source-mirror.h
index 55f7c67c..844ea768 100644
--- a/source/source-mirror.h
+++ b/source/source-mirror.h
@@ -76,14 +76,14 @@ namespace Source {
 
 		// Audio
 		bool m_enableAudio = false;
-		std::unique_ptr<obs::audio_capture> m_mirrorAudio;
+		std::unique_ptr<obs::audio_capture> m_audioCapture;
 		std::mutex m_audioLock;
 		std::condition_variable m_audioNotify;
 		obs_source_audio m_audioOutput;
 		std::vector<std::vector<float_t>> m_audioData;
 		std::thread m_audioThread;
-		bool m_audioKill = false;
-		bool m_audioExists = false;
+		bool m_killAudioThread = false;
+		bool m_haveAudioOutput = false;
 
 		public:
 		Mirror(obs_data_t*, obs_source_t*);