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

Few more fixes

merge-requests/9/merge
Phil Taylor 2022-02-02 16:02:40 +00:00
rodzic 21a8bbc1a6
commit 824a91b125
3 zmienionych plików z 15 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
servermain.cpp
Wyświetl plik

@ -403,7 +403,7 @@ void servermain::setServerToPrefs()
} }
} }
connect(udp, SIGNAL(haveNetworkStatus(QString)), this, SLOT(receiveStatusUpdate(QString))); connect(udp, SIGNAL(haveNetworkStatus(networkStatus)), this, SLOT(receiveStatusUpdate(networkStatus)));
serverThread->start(); serverThread->start();
@ -554,14 +554,14 @@ void servermain::loadSettings()
for (unsigned int i = 1; i < devices; i++) { for (unsigned int i = 1; i < devices; i++) {
info = audio->getDeviceInfo(i); info = audio->getDeviceInfo(i);
if (info.outputChannels > 0) { if (info.outputChannels > 0) {
if (tempPrefs->txAudio.name == info->name) { if (tempPrefs->txAudioSetup.name == info->name) {
tempPrefs->txAudio.port = i; tempPrefs->txAudioSetup.port = i;
txDeviceFound = true; txDeviceFound = true;
} }
} }
if (info.inputChannels > 0) { if (info.inputChannels > 0) {
if (tempPrefs->rxAudio.name == info->name) { if (tempPrefs->rxAudioSetup.name == info->name) {
tempPrefs->rxAudio.port = i; tempPrefs->rxAudioSetup.port = i;
rxDeviceFound = true; rxDeviceFound = true;
} }
} }
@ -571,14 +571,14 @@ void servermain::loadSettings()
{ {
info = Pa_GetDeviceInfo(i); info = Pa_GetDeviceInfo(i);
if (info->maxInputChannels > 0) { if (info->maxInputChannels > 0) {
if (tempPrefs->txAudio.name == info->name) { if (tempPrefs->txAudioSetup.name == info->name) {
tempPrefs->txAudio.port = i; tempPrefs->txAudioSetup.port = i;
txDeviceFound = true; txDeviceFound = true;
} }
} }
if (info->maxOutputChannels > 0) { if (info->maxOutputChannels > 0) {
if (tempPrefs->rxAudio.name == info->name) { if (tempPrefs->rxAudioSetup.name == info->name) {
tempPrefs->rxAudio.port = i; tempPrefs->rxAudioSetup.port = i;
rxDeviceFound = true; rxDeviceFound = true;
} }
} }

8
udpserver.cpp
Wyświetl plik

@ -122,9 +122,8 @@ udpServer::~udpServer()
udpAudio->close(); udpAudio->close();
delete udpAudio; delete udpAudio;
} }
status.message = QString("");
//emit haveNetworkStatus(QString("")); emit haveNetworkStatus(status);
} }
@ -1455,7 +1454,8 @@ void udpServer::watchdog()
} }
} }
//emit haveNetworkStatus(QString("<pre>Server connections: Control:%1 CI-V:%2 Audio:%3</pre>").arg(controlClients.size()).arg(civClients.size()).arg(audioClients.size())); status.message = QString("<pre>Server connections: Control:%1 CI-V:%2 Audio:%3</pre>").arg(controlClients.size()).arg(civClients.size()).arg(audioClients.size());
emit haveNetworkStatus(status);
} }
void udpServer::sendStatus(CLIENT* c) void udpServer::sendStatus(CLIENT* c)

2
udpserver.h
Wyświetl plik

@ -220,6 +220,8 @@ private:
QHostAddress hasTxAudio; QHostAddress hasTxAudio;
QTimer* wdTimer; QTimer* wdTimer;
networkStatus status;
}; };