flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 02:35:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replaced set of voice connection signals with one general

Browse Source 
The different IVoice signals representing a single event
from the voice connection have been replaced by a general
signal emitted when something per com unit has changed.
It passes old and new status.
refs #105
This commit is contained in:
Roland Winklmeier
2014-02-10 20:00:29 +01:00
parent 55b946d32f
commit 372a668134
5 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackcore/voice_vatlib.cpp
View File

@@ -38,7 +38,6 @@ namespace BlackCore
// setOutputDevice(defaultAudioOutputDevice());
connect(this, &CVoiceVatlib::userJoinedLeft, this, &CVoiceVatlib::onUserJoinedLeft, Qt::QueuedConnection);
connect(this, &CVoiceVatlib::connected, this, &CVoiceVatlib::onUserJoinedLeft, Qt::QueuedConnection);
this->m_voiceRooms.push_back(CVoiceRoom()); // COM1
this->m_voiceRooms.push_back(CVoiceRoom()); // COM2
@@ -336,6 +335,7 @@ namespace BlackCore
vr = voiceRoom;
vr.setConnected(true);
this->setVoiceRoomForUnit(comUnit, vr);
changeConnectionStatus(comUnit, Connecting);
QString serverSpec = voiceRoom.getVoiceRoomUrl();
m_voice->JoinRoom(static_cast<qint32>(comUnit), m_aircraftCallsign.toQString().toLatin1().constData(), serverSpec.toLatin1().constData());
}
@@ -361,6 +361,7 @@ namespace BlackCore
m_voice->LeaveRoom(static_cast<qint32>(comUnit));
vr.setConnected(false);
this->setVoiceRoomForUnit(comUnit, vr);
changeConnectionStatus(comUnit, Disconnecting);
}
catch (...)
{
@@ -443,21 +444,21 @@ namespace BlackCore
switchAudioOutput(comUnit, this->m_outputEnabled[comUnit]);
vr.setConnected(true);
this->setVoiceRoomForUnit(comUnit, vr);
emit connected(comUnit);
changeConnectionStatus(comUnit, Connected);
emit userJoinedLeft(comUnit);
break;
case Cvatlib_Voice_Simple::roomStatusUpdate_JoinFail:
vr.setConnected(false);
this->setVoiceRoomForUnit(comUnit, vr);
emit connectionFailed(comUnit);
changeConnectionStatus(comUnit, ConnectingFailed);
break;
case Cvatlib_Voice_Simple::roomStatusUpdate_UnexpectedDisconnectOrKicked:
vr.setConnected(false);
this->setVoiceRoomForUnit(comUnit, vr);
emit kicked(comUnit);
changeConnectionStatus(comUnit, DisconnectedError);
break;
case Cvatlib_Voice_Simple::roomStatusUpdate_LeaveComplete:
m_voiceRoomCallsigns.clear();
emit disconnected(comUnit);
break;
case Cvatlib_Voice_Simple::roomStatusUpdate_UserJoinsLeaves:
// FIXME: We cannot call GetRoomUserList because vatlib is not reentrent safe.
@@ -717,4 +718,15 @@ namespace BlackCore
}
}
// Change voice room status and emit signal
void CVoiceVatlib::changeConnectionStatus(ComUnit comUnit, ConnectionStatus newStatus)
{
ConnectionStatus currentStatus = m_connectionStatus.value(comUnit);
if (newStatus != currentStatus)
{
m_connectionStatus.insert(comUnit, newStatus);
emit connectionStatusChanged(comUnit, currentStatus, newStatus);
}
}
} // namespace