REFAC(client): More semantics & code clean-up for JACK transport feature

mumble-voip · Feb 23, 2024 · 41a67d6 · 41a67d6
1 parent 6129ad9
commit 41a67d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/mumble/JackAudio.cpp b/src/mumble/JackAudio.cpp
@@ -1148,7 +1148,7 @@ void JackAudioOutput::prepareOutputBuffers(unsigned int frameCount, QList< Audio
 		const ClientUser *user   = it.key();
 		AudioOutputBuffer *audio = it.value();
 
-		if (!user || !recorder || (recorder && !recorder->isTransportEnabled())) {
+		if (!user) {
 			if (audio->prepareSampleBuffer(frameCount)) {
 				qlMix.append(audio);
 			} else {
@@ -1180,7 +1180,7 @@ void JackAudioOutput::prepareOutputBuffers(unsigned int frameCount, QList< Audio
 			}
 		}
 
-		downMixBuffer.reserve(frameCount);
+		downMixBuffer.resize(frameCount);
 		if (audio->prepareSampleBuffer(frameCount)) {
 			qlMix.append(audio);
 

diff --git a/src/mumble/VoiceRecorder.cpp b/src/mumble/VoiceRecorder.cpp
@@ -323,7 +323,7 @@ void VoiceRecorder::run() {
 			break;
 		}
 
-		const bool shouldMixDown = m_config.mixDownMode == true && m_config.transportEnable;
+		const bool shouldMixDown = m_config.mixDownMode && m_config.transportEnable;
 		while (!shouldMixDown && !m_abort && !m_recordBuffer.isEmpty()) {
 			boost::shared_ptr< RecordBuffer > rb;
 			{