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

Ref T339, simulator info message (version) for SUP supervisor

Browse Source
This commit is contained in:
Klaus Basan
2018-09-10 17:59:32 +02:00
parent 97cf9f4939
commit 27f2fe1b57
4 changed files with 47 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -34,6 +34,7 @@
#include "blackmisc/pq/speed.h"
#include "blackmisc/pq/time.h"
#include "blackmisc/pq/units.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/compare.h"
#include "blackmisc/json.h"
#include "blackmisc/logmessage.h"
@@ -112,6 +113,7 @@ namespace BlackCore
void CNetworkVatlib::initializeSession()
{
Q_ASSERT_X(isDisconnected(), Q_FUNC_INFO, "attempted to reinitialize session while still connected");
Q_ASSERT_X(sApp, Q_FUNC_INFO, "Need sApp");
int clientCapabilities = vatCapsAircraftInfo | vatCapsFastPos | vatCapsAtcInfo | vatCapsAircraftConfig;
if (m_loginMode == LoginStealth)
@@ -134,10 +136,11 @@ namespace BlackCore
default: serverType = vatServerLegacyFsd; break;
}
const QString hostApplication = this->getNetworkHostApplicationString().replace(':', ' ');
m_net.reset(Vat_CreateNetworkSession(serverType, sApp->swiftVersionChar(),
CBuildConfig::getVersion().majorVersion(),
CBuildConfig::getVersion().minorVersion(),
"None", clientId, clientKey.toLocal8Bit().constData(),
toFSD(hostApplication), clientId, toFSD(clientKey),
clientCapabilities));
Vat_SetStateChangeHandler(m_net.data(), onConnectionStatusChanged, this);
@@ -335,6 +338,11 @@ namespace BlackCore
return m_fsdTextCodec->toUnicode(cstr);
}
QString CNetworkVatlib::getNetworkHostApplicationString() const
{
return this->getSimulatorNameAndVersion();
}
QStringList CNetworkVatlib::fromFSD(const char **cstrArray, int size) const
{
QStringList qstrList;
@@ -1002,7 +1010,7 @@ namespace BlackCore
// ATIS often have a range of 0 nm. Correct this to a proper value.
if (cs.contains("_ATIS") && pos->visibleRange == 0) { range.setValueSameUnit(50.0); }
CCoordinateGeodetic position(pos->latitude, pos->longitude, 0);
emit cbvar_cast(cbvar)->atcPositionUpdate( CCallsign(cs, CCallsign::Atc), freq, position, range);
emit cbvar_cast(cbvar)->atcPositionUpdate(CCallsign(cs, CCallsign::Atc), freq, position, range);
}
void CNetworkVatlib::onKicked(VatFsdClient *, const char *reason, void *cbvar)

1
src/blackcore/vatsim/networkvatlib.h
View File

@@ -175,6 +175,7 @@ namespace BlackCore
QByteArray toFSD(const BlackMisc::Aviation::CCallsign &callsign) const;
std::function<const char **()> toFSD(const QStringList &qstrList) const;
QString fromFSD(const char *cstr) const;
QString getNetworkHostApplicationString() const; //!< simulator version and details info string
QStringList fromFSD(const char **cstrArray, int size) const;
bool isInterimPositionUpdateEnabledForServer() const;
const BlackMisc::Network::CFsdSetup &getSetupForServer() const;