Fixed many UI bugs, standalone option is now actually respected (file…

…s aren't emitted), hopefully fixed non-Windows builds by adding to EnumStringConversions.cpp
mumble-voip · Jan 26, 2023 · 950ae01 · 950ae01
1 parent 84da087
commit 950ae01
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/mumble/EnumStringConversions.cpp b/src/mumble/EnumStringConversions.cpp
@@ -84,7 +84,9 @@
 
 #define RECORDING_MODE_VALUES                                     \
 	PROCESS(Settings::RecordingMode, RecordingMixdown, "Mixdown") \
-	PROCESS(Settings::RecordingMode, RecordingMultichannel, "Multichannel")
+	PROCESS(Settings::RecordingMode, RecordingMultichannel, "Multichannel") \
+	PROCESS(Settings::RecordingMode, RecordingMultichannelAndTransport, "MultichannelAndTransport") \
+	PROCESS(Settings::RecordingMode, RecordingTransportStandalone, "MultichannelAndTransport")
 
 #define SEARCH_USER_ACTION_VALUES                           \
 	PROCESS(Search::SearchDialog::UserAction, NONE, "None") \

diff --git a/src/mumble/JackAudio.cpp b/src/mumble/JackAudio.cpp
@@ -1113,7 +1113,7 @@ void JackAudioOutput::prepareOutputBuffers(unsigned int frameCount, QList< Audio
 		const ClientUser *user   = it.key();
 		AudioOutputBuffer *audio = it.value();
 
-		if (!user || (recorder && !recorder->isTransportEnabled())) {
+		if (!user || !recorder || (recorder && !recorder->isTransportEnabled())) {
 			if (audio->prepareSampleBuffer(frameCount)) {
 				qlMix->append(audio);
 			} else {

diff --git a/src/mumble/VoiceRecorder.cpp b/src/mumble/VoiceRecorder.cpp
@@ -311,7 +311,7 @@ void VoiceRecorder::run() {
 			break;
 		}
 
-		while (!m_abort && !m_recordBuffer.isEmpty()) {
+		while (!(m_config.mixDownMode && m_config.transportEnable) && !m_abort && !m_recordBuffer.isEmpty()) {
 			boost::shared_ptr< RecordBuffer > rb;
 			{
 				QMutexLocker l(&m_bufferLock);

diff --git a/src/mumble/VoiceRecorderDialog.cpp b/src/mumble/VoiceRecorderDialog.cpp
@@ -32,6 +32,8 @@ VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p) : QDialog(p), qtTimer(new Q
 											== Settings::RecordingMultichannelAndTransport);
 	qrbTransportStandalone->setChecked(Global::get().s.rmRecordingMode == Settings::RecordingTransportStandalone);
 
+	qgbOutput->setDisabled(qrbTransportStandalone->isChecked());
+
 	QString qsTooltip = QString::fromLatin1("%1"
 											"<table>"
 											"  <tr>"
@@ -188,7 +190,7 @@ void VoiceRecorderDialog::on_qpbStart_clicked() {
 	VoiceRecorder::Config config;
 	config.sampleRate      = ao->getMixerFreq();
 	config.fileName        = dir.absoluteFilePath(basename + QLatin1Char('.') + suffix);
-	config.mixDownMode     = qrbDownmix->isChecked();
+	config.mixDownMode     = qrbDownmix->isChecked() || qrbTransportStandalone->isChecked();
 	config.transportEnable = qrbMultichannelAndTransport->isChecked() || qrbTransportStandalone->isChecked();
 	config.recordingFormat = static_cast< VoiceRecorderFormat::Format >(ifm);
 
@@ -286,7 +288,7 @@ void VoiceRecorderDialog::reset(bool resettimer) {
 	qpbStop->setText(tr("S&top"));
 
 	qgbMode->setEnabled(true);
-	qgbOutput->setEnabled(true);
+	qgbOutput->setDisabled(qrbTransportStandalone->isChecked());
 
 	if (resettimer)
 		qlTime->setText(QLatin1String("00:00:00"));