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

Update to new vatlib

Browse Source
This commit is contained in:
Roland Winklmeier
2018-10-02 13:09:03 +02:00
committed by Klaus Basan
parent 4387c3b433
commit c0d9aacbb1
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: 51305ae2a6...cdeeb245d5

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

@@ -95,7 +95,7 @@ namespace BlackCore
Q_ASSERT_X(Vat_GetVersion() == VAT_LIBVATLIB_VERSION, "swift.network", "Wrong vatlib shared library installed"); Q_ASSERT_X(Vat_GetVersion() == VAT_LIBVATLIB_VERSION, "swift.network", "Wrong vatlib shared library installed");
Vat_SetNetworkLogHandler(SeverityLevel::SeverityError, CNetworkVatlib::networkLogHandler); Vat_SetNetworkLogHandler(vatSeverityError, CNetworkVatlib::networkLogHandler);
m_processingTimer.setObjectName(this->objectName().append(":m_processingTimer")); m_processingTimer.setObjectName(this->objectName().append(":m_processingTimer"));
m_positionUpdateTimer.setObjectName(this->objectName().append(":m_positionUpdateTimer")); m_positionUpdateTimer.setObjectName(this->objectName().append(":m_positionUpdateTimer"));
@@ -1453,7 +1453,7 @@ namespace BlackCore
); );
} }
void CNetworkVatlib::networkLogHandler(SeverityLevel /** severity **/, const char *context, const char *message) void CNetworkVatlib::networkLogHandler(VatSeverityLevel /** severity **/, const char *context, const char *message)
{ {
const QString errorMessage = QStringLiteral("vatlib ") % context % QStringLiteral(": ") % message; const QString errorMessage = QStringLiteral("vatlib ") % context % QStringLiteral(": ") % message;
CLogMessage(static_cast<CNetworkVatlib *>(nullptr)).error(errorMessage); CLogMessage(static_cast<CNetworkVatlib *>(nullptr)).error(errorMessage);

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

@@ -187,7 +187,7 @@ namespace BlackCore
bool isDisconnected() const { return m_status != vatStatusConnecting && m_status != vatStatusConnected; } bool isDisconnected() const { return m_status != vatStatusConnecting && m_status != vatStatusConnected; }
static QString convertToUnicodeEscaped(const QString &str); static QString convertToUnicodeEscaped(const QString &str);
static VatSimType convertToSimType(BlackMisc::Simulation::CSimulatorPluginInfo &simInfo); static VatSimType convertToSimType(BlackMisc::Simulation::CSimulatorPluginInfo &simInfo);
static void networkLogHandler(SeverityLevel severity, const char *context, const char *message); static void networkLogHandler(VatSeverityLevel severity, const char *context, const char *message);
void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data); void sendCustomPacket(const BlackMisc::Aviation::CCallsign &callsign, const QString &packetId, const QStringList &data);
static const QString &defaultModelString() static const QString &defaultModelString()

16
src/blackcore/vatsim/voicevatlib.cpp
View File

@@ -38,7 +38,7 @@ namespace BlackCore
m_audioService(Vat_CreateAudioService()) m_audioService(Vat_CreateAudioService())
{ {
const int udpPort = m_vatsimVoiceSettings.get().getVatsimUdpVoicePort(); const int udpPort = m_vatsimVoiceSettings.get().getVatsimUdpVoicePort();
Vat_SetVoiceLogHandler(SeverityLevel::SeverityError, CVoiceVatlib::voiceLogHandler); Vat_SetVoiceLogHandler(vatSeverityDebug, CVoiceVatlib::voiceLogHandler);
m_udpPort.reset(Vat_CreateUDPAudioPort(m_audioService.data(), udpPort)); m_udpPort.reset(Vat_CreateUDPAudioPort(m_audioService.data(), udpPort));
// do processing // do processing
@@ -155,13 +155,15 @@ namespace BlackCore
Vat_ExecuteVoiceTasks(m_audioService.data()); Vat_ExecuteVoiceTasks(m_audioService.data());
} }
void CVoiceVatlib::voiceLogHandler(SeverityLevel /** severity **/, const char *context, const char *message) void CVoiceVatlib::voiceLogHandler(VatSeverityLevel severity, const char *context, const char *message)
{ {
QString errorMessage("vatlib "); QString logMessage(context);
errorMessage += context; logMessage += ": ";
errorMessage += ": "; logMessage += message;
errorMessage += message; if (severity == vatSeverityDebug) { CLogMessage(static_cast<CVoiceVatlib *>(nullptr)).debug(logMessage); }
CLogMessage(static_cast<CVoiceVatlib *>(nullptr)).error(errorMessage); else if (severity == vatSeverityInfo) { CLogMessage(static_cast<CVoiceVatlib *>(nullptr)).info(logMessage); }
else if (severity == vatSeverityWarning) { CLogMessage(static_cast<CVoiceVatlib *>(nullptr)).warning(logMessage); }
else if (severity == vatSeverityError) { CLogMessage(static_cast<CVoiceVatlib *>(nullptr)).error(logMessage); }
} }
} // namespace } // namespace
} // namespace } // namespace

2
src/blackcore/vatsim/voicevatlib.h
View File

@@ -122,7 +122,7 @@ namespace BlackCore
} }
}; };
static void voiceLogHandler(SeverityLevel severity, const char *context, const char *message); static void voiceLogHandler(VatSeverityLevel severity, const char *context, const char *message);
BlackMisc::CSetting<BlackMisc::Audio::Settings::TVoiceSetup> m_vatsimVoiceSettings { this }; BlackMisc::CSetting<BlackMisc::Audio::Settings::TVoiceSetup> m_vatsimVoiceSettings { this };
QScopedPointer<VatAudioService, VatAudioServiceDeleter> m_audioService; QScopedPointer<VatAudioService, VatAudioServiceDeleter> m_audioService;