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

Ref T730, add AFV test server in "test server list"

Browse Source
This commit is contained in:
Klaus Basan
2019-09-30 22:23:37 +02:00
committed by Mat Sutcliffe
parent 30158975b6
commit 5c56715c28
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/data/globalsetup.cpp
View File

@@ -278,7 +278,13 @@ namespace BlackCore
CServerList CGlobalSetup::getPredefinedServersPlusHardcodedServers() const CServerList CGlobalSetup::getPredefinedServersPlusHardcodedServers() const
{ {
static const CServerList hardcoded({ CServer::swiftFsdTestServer(), CServer::fscServer(), CServer::esTowerView() }); static const CServerList hardcoded(
{
CServer::swiftFsdTestServer(),
CServer::fscFsdServer(),
CServer::afvFsdTestServer(),
CServer::esTowerView()
});
CServerList testServers(m_predefinedServers); CServerList testServers(m_predefinedServers);
testServers.addIfAddressNotExists(hardcoded); testServers.addIfAddressNotExists(hardcoded);
return testServers; return testServers;

15
src/blackmisc/network/server.cpp
View File

@@ -7,12 +7,13 @@
*/ */
#include "blackmisc/network/server.h" #include "blackmisc/network/server.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/logcategorylist.h" #include "blackmisc/logcategorylist.h"
#include "blackmisc/logcategory.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
#include "blackmisc/statusmessage.h" #include "blackmisc/statusmessage.h"
#include "blackmisc/comparefunctions.h" #include "blackmisc/comparefunctions.h"
#include "blackmisc/obfuscation.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
#include "blackmisc/verify.h" #include "blackmisc/verify.h"
@@ -75,7 +76,7 @@ namespace BlackMisc
return withPw ? dvp : dvnWithPw; return withPw ? dvp : dvnWithPw;
} }
const CServer &CServer::fscServer() const CServer &CServer::fscFsdServer()
{ {
static const CServer fsc = [] static const CServer fsc = []
{ {
@@ -88,6 +89,14 @@ namespace BlackMisc
return fsc; return fsc;
} }
const CServer &CServer::afvFsdTestServer()
{
static const CServer afv("AFV testserver", "VATSIM AFV testserver", "afv-beta-fsd.vatsim.net", 6809,
CUser("OBF:AwLZ7f9hUmpSZhm4=", "OBF:AwJGiYV4GHQSMizchFk2=", "", ""),
CFsdSetup(), CVoiceSetup(), CEcosystem(CEcosystem::vatsim()), CServer::FSDServerVatsim);
return afv;
}
const CServer &CServer::esTowerView() const CServer &CServer::esTowerView()
{ {
static const CServer s = CServer("ES Tower", "Euroscope Tower view", "localhost", 6809, static const CServer s = CServer("ES Tower", "Euroscope Tower view", "localhost", 6809,

5
src/blackmisc/network/server.h
View File

@@ -220,7 +220,10 @@ namespace BlackMisc
static const CServer &swiftFsdTestServer(bool withPw = false); static const CServer &swiftFsdTestServer(bool withPw = false);
//! FSC server //! FSC server
static const CServer &fscServer(); static const CServer &fscFsdServer();
//! The AFV test server
static const CServer &afvFsdTestServer();
//! ES tower server //! ES tower server
static const CServer &esTowerView(); static const CServer &esTowerView();

2
src/blackmisc/network/serverlist.h
View File

@@ -27,7 +27,7 @@ namespace BlackMisc
//! Value object encapsulating a list of servers. //! Value object encapsulating a list of servers.
class BLACKMISC_EXPORT CServerList : class BLACKMISC_EXPORT CServerList :
public CSequence<CServer>, public CSequence<CServer>,
public BlackMisc::Mixin::MetaType<CServerList> public Mixin::MetaType<CServerList>
{ {
public: public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CServerList) BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CServerList)