Merge branch 'master' of git@gitcode.net:coloreaglestdio/taskbus.git

modules/sinks/sink_soundcard/dialogsoundcard.cpp

@@ -110,25 +110,19 @@ void DialogSoundCard::InitMonitor()
 	mFormatSound.setCodec("audio/pcm"); //set codec as simple audio/pcm
 	mFormatSound.setSampleRate(ui->spinbox_sprate->value());
 	mFormatSound.setChannelCount(ui->spinbox_channels->value());
-	QAudioDeviceInfo infoIn;
+
+	//QAudioDeviceInfo infoOut(QAudioDeviceInfo::defaultOutputDevice());
+	QAudioDeviceInfo infoOut;
 	if (ui->comboBox_audioDevices->currentIndex()>=0 &&
 			ui->comboBox_audioDevices->currentIndex()<m_devOutputModule->rowCount())
-		infoIn = m_devOutputlist[ui->comboBox_audioDevices->currentIndex()];
+		infoOut = m_devOutputlist[ui->comboBox_audioDevices->currentIndex()];
 	else
-		infoIn = QAudioDeviceInfo::defaultInputDevice();
-	if (!infoIn.isFormatSupported(mFormatSound))
-	{
-		//Default format not supported - trying to use nearest
-		mFormatSound = infoIn.nearestFormat(mFormatSound);
-	}
-
-	QAudioDeviceInfo infoOut(QAudioDeviceInfo::defaultOutputDevice());
+		infoOut = QAudioDeviceInfo::defaultOutputDevice();
 	if (!infoOut.isFormatSupported(mFormatSound))
 	{
 		//Default format not supported - trying to use nearest
-		mFormatSound = infoOut.nearestFormat(mFormatSound);
+		//mFormatSound = infoOut.nearestFormat(mFormatSound);
 	}
-
 	CreateAudioOutput();
 	mpOutDevSound = mpAudioOutputSound->start();
 	connect(ui->horizontalSlider, SIGNAL(valueChanged(int)),

modules/sources/source_soundcard/dialogsoundcard.cpp

@@ -118,14 +118,7 @@ void DialogSoundCard::InitMonitor()
 	if (!infoIn.isFormatSupported(mFormatSound))
 	{
 		//Default format not supported - trying to use nearest
-		mFormatSound = infoIn.nearestFormat(mFormatSound);
-	}
-
-	QAudioDeviceInfo infoOut(QAudioDeviceInfo::defaultOutputDevice());
-	if (!infoOut.isFormatSupported(mFormatSound))
-	{
-		//Default format not supported - trying to use nearest
-		mFormatSound = infoOut.nearestFormat(mFormatSound);
+		//mFormatSound = infoIn.nearestFormat(mFormatSound);
 	}
 
 	CreateAudioInput();