mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Remove obsolete code

knobtest
Phil Taylor 2022-09-25 18:22:48 +01:00
rodzic 518e1700ae
commit b7af0d4edd
1 zmienionych plików z 2 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
wfmain.cpp
Wyświetl plik

@ -6172,15 +6172,13 @@ void wfmain::setAudioDevicesUI()
QString defaultAudioInputName; QString defaultAudioInputName;
QString defaultAudioOutputName; QString defaultAudioOutputName;
int inCount = 0;
int outCount = 0;
switch (prefs.audioSystem) switch (prefs.audioSystem)
{ {
case qtAudio: case qtAudio:
{ {
Pa_Terminate(); Pa_Terminate();
int inCount = 0;
foreach(const QAudioDeviceInfo & deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioInput)) foreach(const QAudioDeviceInfo & deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
{ {
if (inCount == 0) if (inCount == 0)
@ -6196,6 +6194,7 @@ void wfmain::setAudioDevicesUI()
inCount++; inCount++;
} }
int outCount = 0;
foreach(const QAudioDeviceInfo & deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)) foreach(const QAudioDeviceInfo & deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
{ {
if (outCount == 0) if (outCount == 0)
@ -6240,9 +6239,7 @@ void wfmain::setAudioDevicesUI()
ui->serverRXAudioInputCombo->addItem(info->name, i); ui->serverRXAudioInputCombo->addItem(info->name, i);
if (i == Pa_GetDefaultInputDevice()) { if (i == Pa_GetDefaultInputDevice()) {
defaultAudioInputName = info->name; defaultAudioInputName = info->name;
defaultAudioInputIndex = inCount;
} }
inCount++;
} }
if (info->maxOutputChannels > 0) { if (info->maxOutputChannels > 0) {
qDebug(logAudio()) << (i == Pa_GetDefaultOutputDevice() ? "*" : " ") << "(" << i << ") Output Device : " << info->name; qDebug(logAudio()) << (i == Pa_GetDefaultOutputDevice() ? "*" : " ") << "(" << i << ") Output Device : " << info->name;
@ -6250,9 +6247,7 @@ void wfmain::setAudioDevicesUI()
ui->serverTXAudioOutputCombo->addItem(info->name, i); ui->serverTXAudioOutputCombo->addItem(info->name, i);
if (i == Pa_GetDefaultOutputDevice()) { if (i == Pa_GetDefaultOutputDevice()) {
defaultAudioOutputName = info->name; defaultAudioOutputName = info->name;
defaultAudioOutputIndex = outCount;
} }
outCount++;
} }
} }
break; break;
@ -6307,9 +6302,7 @@ void wfmain::setAudioDevicesUI()
ui->serverRXAudioInputCombo->addItem(QString::fromStdString(info.name), i); ui->serverRXAudioInputCombo->addItem(QString::fromStdString(info.name), i);
if (info.isDefaultInput) { if (info.isDefaultInput) {
defaultAudioInputName = QString::fromStdString(info.name); defaultAudioInputName = QString::fromStdString(info.name);
defaultAudioInputIndex = inCount;
} }
inCount++;
} }
if (info.outputChannels > 0) { if (info.outputChannels > 0) {
qInfo(logAudio()) << (info.isDefaultOutput ? "*" : " ") << "(" << i << ") Output Device : " << QString::fromStdString(info.name); qInfo(logAudio()) << (info.isDefaultOutput ? "*" : " ") << "(" << i << ") Output Device : " << QString::fromStdString(info.name);
@ -6317,9 +6310,7 @@ void wfmain::setAudioDevicesUI()
ui->serverTXAudioOutputCombo->addItem(QString::fromStdString(info.name), i); ui->serverTXAudioOutputCombo->addItem(QString::fromStdString(info.name), i);
if (info.isDefaultOutput) { if (info.isDefaultOutput) {
defaultAudioOutputName = QString::fromStdString(info.name); defaultAudioOutputName = QString::fromStdString(info.name);
defaultAudioOutputIndex = outCount;
} }
outCount++;
} }
} }
@ -6364,7 +6355,6 @@ void wfmain::setAudioDevicesUI()
} }
} }
//on_audioInputCombo_currentIndexChanged(ui->audioInputCombo->currentIndex());
int audioOutputIndex = ui->audioOutputCombo->findText(rxSetup.name); int audioOutputIndex = ui->audioOutputCombo->findText(rxSetup.name);
if (audioOutputIndex != -1) { if (audioOutputIndex != -1) {
@ -6381,7 +6371,6 @@ void wfmain::setAudioDevicesUI()
qWarning(logGui()) << "Unable to select default output device," << defaultAudioOutputName << " help....."; qWarning(logGui()) << "Unable to select default output device," << defaultAudioOutputName << " help.....";
} }
} }
//on_audioOutputCombo_currentIndexChanged(ui->audioOutputCombo->currentIndex());
if (!serverConfig.rigs.isEmpty()) if (!serverConfig.rigs.isEmpty())