Fix typo for portaudio/rtaudio builds

merge-requests/8/head
Phil Taylor 2021-12-30 18:27:22 +00:00
rodzic cf1caf0a0f
commit daf94543ac
2 zmienionych plików z 60 dodań i 17 usunięć

Wyświetl plik

@ -1800,9 +1800,9 @@ void wfmain::on_serverAudioPortText_textChanged(QString text)
void wfmain::on_serverRXAudioInputCombo_currentIndexChanged(int value) void wfmain::on_serverRXAudioInputCombo_currentIndexChanged(int value)
{ {
#if defined(RTAUDIO) #if defined(RTAUDIO)
serverRxSetup.port = ui->serverRXaudioInputCombo->itemData(value).toInt(); serverRxSetup.port = ui->serverRXAudioInputCombo->itemData(value).toInt();
#elif defined(PORTAUDIO) #elif defined(PORTAUDIO)
serverRxSetup.port = ui->serverRXaudioInputCombo->itemData(value).toInt(); serverRxSetup.port = ui->serverRXAudioInputCombo->itemData(value).toInt();
#else #else
QVariant v = ui->serverRXAudioInputCombo->itemData(value); QVariant v = ui->serverRXAudioInputCombo->itemData(value);
serverRxSetup.port = v.value<QAudioDeviceInfo>(); serverRxSetup.port = v.value<QAudioDeviceInfo>();
@ -1811,6 +1811,20 @@ void wfmain::on_serverRXAudioInputCombo_currentIndexChanged(int value)
qDebug(logGui()) << "Changed default server audio input to:" << serverRxSetup.name; qDebug(logGui()) << "Changed default server audio input to:" << serverRxSetup.name;
} }
void wfmain::on_serverTXAudioOutputCombo_currentIndexChanged(int value)
{
#if defined(RTAUDIO)
serverTxSetup.port = ui->serverTXAudioOutputCombo->itemData(value).toInt();
#elif defined(PORTAUDIO)
serverTxSetup.port = ui->serverTXAudioOutputCombo->itemData(value).toInt();
#else
QVariant v = ui->serverTXAudioOutputCombo->itemData(value);
serverTxSetup.port = v.value<QAudioDeviceInfo>();
#endif
serverTxSetup.name = ui->serverTXAudioOutputCombo->itemText(value);
qDebug(logGui()) << "Changed default server audio output to:" << serverTxSetup.name;
}
void wfmain::on_serverUsersTable_cellChanged(int row, int column) void wfmain::on_serverUsersTable_cellChanged(int row, int column)
{ {
qInfo() << "Cell Changed:" << row << "," << column; qInfo() << "Cell Changed:" << row << "," << column;
@ -1834,19 +1848,6 @@ void wfmain::on_serverUsersTable_cellChanged(int row, int column)
} }
} }
void wfmain::on_serverTXAudioOutputCombo_currentIndexChanged(int value)
{
#if defined(RTAUDIO)
serverTxSetup.port = ui->serverTXAudioOutputCombo->itemData(value).toInt();
#elif defined(PORTAUDIO)
serverTxSetup.port = ui->serverTXAudioOutputCombo->itemData(value).toInt();
#else
QVariant v = ui->serverTXAudioOutputCombo->itemData(value);
serverTxSetup.port = v.value<QAudioDeviceInfo>();
#endif
serverTxSetup.name = ui->serverTXAudioOutputCombo->itemText(value);
qDebug(logGui()) << "Changed default server audio output to:" << serverTxSetup.name;
}
void wfmain::saveSettings() void wfmain::saveSettings()
{ {

Wyświetl plik

@ -208,12 +208,55 @@
</QtMoc> </QtMoc>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="debug\moc_predefs.h.cbt"> <CustomBuild Include="debug\moc_predefs.h.cbt">
<Filter>Generated Files</Filter> <Filter>Generated Files</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="release\moc_predefs.h.cbt"> <CustomBuild Include="release\moc_predefs.h.cbt">
<Filter>Generated Files</Filter> <Filter>Generated Files</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<QtUic Include="aboutbox.ui"> <QtUic Include="aboutbox.ui">
@ -368,7 +411,6 @@
<None Include="resources\wfview.png"> <None Include="resources\wfview.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="resources\wfview.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="resources\install.sh"> <None Include="resources\install.sh">
@ -382,6 +424,6 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include=".\wfview_resource.rc" /> <ResourceCompile Include="C:\Users\Phil\source\repos\wfview\wfview_resource.rc" />
</ItemGroup> </ItemGroup>
</Project> </Project>