From e51bbd1f5dee7081c652ba31be8456e3c76f2a2f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 28 Sep 2018 05:05:15 +0200 Subject: [PATCH] Ref T376, adjusted CServer class ctor --- src/blackcore/vatsim/vatsimdatafilereader.cpp | 7 +++++-- src/blackmisc/test/testdata.cpp | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp index 92b8c0ecc..f050b3f1f 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp @@ -47,6 +47,7 @@ using namespace BlackMisc; using namespace BlackMisc::Aviation; +using namespace BlackMisc::Audio; using namespace BlackMisc::Network; using namespace BlackMisc::Geo; using namespace BlackMisc::Simulation; @@ -363,7 +364,8 @@ namespace BlackCore const QString description(fsdServerParts.at(2)); // part(3) could be added const CServer fsdServer(fsdServerParts.at(0), description, fsdServerParts.at(1), 6809, 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); } break; @@ -375,7 +377,8 @@ namespace BlackCore if (!voiceServerParts.at(3).trimmed().contains('1')) break; // allowed? const CServer voiceServer(voiceServerParts.at(1), voiceServerParts.at(2), voiceServerParts.at(0), -1, CUser(), - CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::VoiceServerVatsim); + CFsdSetup(), CVoiceSetup::vatsimStandard(), + CEcosystem(CEcosystem::VATSIM), CServer::VoiceServerVatsim); voiceServers.push_back(voiceServer); } break; diff --git a/src/blackmisc/test/testdata.cpp b/src/blackmisc/test/testdata.cpp index 636533ea7..9bddd5ae1 100644 --- a/src/blackmisc/test/testdata.cpp +++ b/src/blackmisc/test/testdata.cpp @@ -20,6 +20,7 @@ using namespace BlackMisc::Aviation; using namespace BlackMisc::Geo; using namespace BlackMisc::Network; +using namespace BlackMisc::Audio; using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Simulation; @@ -36,7 +37,7 @@ namespace BlackMisc { static const CServer trafficServer("fooserver", "a foo server", "localhost", 1234, CUser("112233", "Some real name", "email@xyz.com", "secret"), - CFsdSetup(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim); + CFsdSetup(), CVoiceSetup(), CEcosystem(CEcosystem::VATSIM), CServer::FSDServerVatsim); return trafficServer; } @@ -318,7 +319,7 @@ namespace BlackMisc { CUser pilot = CTestData::getRandomPilot(); 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.setCom1ActiveFrequency(CTestData::getRandomAtcStation().getFrequency()); aircraft.setCom2ActiveFrequency(CTestData::getRandomAtcStation().getFrequency());