flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 18:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T376, adjusted CServer class ctor

Browse Source
This commit is contained in:
Klaus Basan
2018-09-28 05:05:15 +02:00
parent 3101a77614
commit e51bbd1f5d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackcore/vatsim/vatsimdatafilereader.cpp
View File

@@ -47,6 +47,7 @@
using namespace BlackMisc; using namespace BlackMisc;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Audio;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackMisc::Geo; using namespace BlackMisc::Geo;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
@@ -363,7 +364,8 @@ namespace BlackCore
const QString description(fsdServerParts.at(2)); // part(3) could be added const QString description(fsdServerParts.at(2)); // part(3) could be added
const CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809, const CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809,
CUser("id", "real name", "email", "password"), CUser("id", "real name", "email", "password"),
CFsdSetup::vatsimStandard(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim); CFsdSetup::vatsimStandard(), CVoiceSetup::vatsimStandard(),
CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim);
fsdServers.push_back(fsdServer); fsdServers.push_back(fsdServer);
} }
break; break;
@@ -375,7 +377,8 @@ namespace BlackCore
if (!voiceServerParts.at(3).trimmed().contains('1')) break; // allowed? if (!voiceServerParts.at(3).trimmed().contains('1')) break; // allowed?
const CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1, const CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1,
CUser(), CUser(),
CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::VoiceServerVatsim); CFsdSetup(), CVoiceSetup::vatsimStandard(),
CEcosystem(CEcosystem::VATSIM), CServer::VoiceServerVatsim);
voiceServers.push_back(voiceServer); voiceServers.push_back(voiceServer);
} }
break; break;

5
src/blackmisc/test/testdata.cpp
View File

@@ -20,6 +20,7 @@
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo; using namespace BlackMisc::Geo;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackMisc::Audio;
using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
@@ -36,7 +37,7 @@ namespace BlackMisc
{ {
static const CServer trafficServer("fooserver", "a foo server", "localhost", 1234, static const CServer trafficServer("fooserver", "a foo server", "localhost", 1234,
CUser("112233", "Some real name", "email@xyz.com", "secret"), CUser("112233", "Some real name", "email@xyz.com", "secret"),
CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim); CFsdSetup(), CVoiceSetup(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim);
return trafficServer; return trafficServer;
} }
@@ -318,7 +319,7 @@ namespace BlackMisc
{ {
CUser pilot = CTestData::getRandomPilot(); CUser pilot = CTestData::getRandomPilot();
CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxAerosoftA320(), pilot, CTestData::getAircraftSituationAboveFrankfurtTower()); CSimulatedAircraft aircraft(pilot.getCallsign(), CTestData::getDbAircraftModelFsxAerosoftA320(), pilot, CTestData::getAircraftSituationAboveFrankfurtTower());
CTransponder t = CTransponder(7000, CTransponder::ModeC); const CTransponder t = CTransponder(7000, CTransponder::ModeC);
aircraft.setTransponder(t); aircraft.setTransponder(t);
aircraft.setCom1ActiveFrequency(CTestData::getRandomAtcStation().getFrequency()); aircraft.setCom1ActiveFrequency(CTestData::getRandomAtcStation().getFrequency());
aircraft.setCom2ActiveFrequency(CTestData::getRandomAtcStation().getFrequency()); aircraft.setCom2ActiveFrequency(CTestData::getRandomAtcStation().getFrequency());