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

Update externals

Browse Source 
* vatlib 0.9.8 (without opus codec)
This commit is contained in:
Roland Winklmeier
2018-06-01 16:40:56 +02:00
committed by Klaus Basan
parent 181ed36f3d
commit 990035dd6a
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: fc3fd64ee7...83d1487407

12
installer/installbuilder/swift-externals.xml
View File

@@ -6,7 +6,6 @@
- vatlib - vatlib
- speex - speex
- speexdsp - speexdsp
- opus
- portaudio</detailedDescription> - portaudio</detailedDescription>
<selected>1</selected> <selected>1</selected>
<show>1</show> <show>1</show>
@@ -33,10 +32,6 @@
<allowWildcards>1</allowWildcards> <allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*speexdsp*.dll</origin> <origin>../../dist/bin/*speexdsp*.dll</origin>
</distributionFile> </distributionFile>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*opus*.dll</origin>
</distributionFile>
<distributionFile> <distributionFile>
<allowWildcards>1</allowWildcards> <allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*swift_crashpad_handler.exe</origin> <origin>../../dist/bin/*swift_crashpad_handler.exe</origin>
@@ -63,10 +58,6 @@
<distributionFile> <distributionFile>
<origin>../../dist/lib/libvatlib.so</origin> <origin>../../dist/lib/libvatlib.so</origin>
</distributionFile> </distributionFile>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>../../dist/lib/libopus.so.*</origin>
</distributionFile>
<distributionFile> <distributionFile>
<allowWildcards>1</allowWildcards> <allowWildcards>1</allowWildcards>
<origin>../../dist/lib/libportaudio.so.*</origin> <origin>../../dist/lib/libportaudio.so.*</origin>
@@ -83,9 +74,6 @@
<name>lib_osx</name> <name>lib_osx</name>
<platforms>osx</platforms> <platforms>osx</platforms>
<distributionFileList> <distributionFileList>
<distributionFile>
<origin>../../dist/lib/libopus.0.dylib</origin>
</distributionFile>
<distributionFile> <distributionFile>
<origin>../../dist/lib/libportaudio.dylib</origin> <origin>../../dist/lib/libportaudio.dylib</origin>
</distributionFile> </distributionFile>

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

@@ -62,7 +62,7 @@
#include <type_traits> #include <type_traits>
static_assert(! std::is_abstract<BlackCore::Vatsim::CNetworkVatlib>::value, "Must implement all pure virtuals"); static_assert(! std::is_abstract<BlackCore::Vatsim::CNetworkVatlib>::value, "Must implement all pure virtuals");
static_assert(VAT_LIBVATLIB_VERSION == 907, "Wrong vatlib header installed"); static_assert(VAT_LIBVATLIB_VERSION == 908, "Wrong vatlib header installed");
using namespace BlackConfig; using namespace BlackConfig;
using namespace BlackMisc; using namespace BlackMisc;
@@ -858,13 +858,13 @@ namespace BlackCore
cbvar_cast(cbvar)->consolidateTextMessage(tm); cbvar_cast(cbvar)->consolidateTextMessage(tm);
} }
void CNetworkVatlib::onRadioMessageReceived(VatFsdClient *, const char *from, int numFreq, int *freqList, const char *msg, void *cbvar) void CNetworkVatlib::onRadioMessageReceived(VatFsdClient *, const char *from, unsigned int numFreq, int *freqList, const char *msg, void *cbvar)
{ {
auto *self = cbvar_cast(cbvar); auto *self = cbvar_cast(cbvar);
const int com1 = self->getOwnAircraft().getCom1System().getFrequencyActive().valueInteger(CFrequencyUnit::kHz()); const int com1 = self->getOwnAircraft().getCom1System().getFrequencyActive().valueInteger(CFrequencyUnit::kHz());
const int com2 = self->getOwnAircraft().getCom2System().getFrequencyActive().valueInteger(CFrequencyUnit::kHz()); const int com2 = self->getOwnAircraft().getCom2System().getFrequencyActive().valueInteger(CFrequencyUnit::kHz());
QList<CFrequency> frequencies; QList<CFrequency> frequencies;
for (int i = 0; i < numFreq; ++i) for (unsigned int i = 0; i < numFreq; ++i)
{ {
if (freqList[i] == com1 || freqList[i] == com2) if (freqList[i] == com1 || freqList[i] == com2)
{ {
@@ -1281,7 +1281,7 @@ namespace BlackCore
CInformationMessage atisMessage; CInformationMessage atisMessage;
atisMessage.setType(CInformationMessage::ATIS); atisMessage.setType(CInformationMessage::ATIS);
for (int i = 0; i < atis->textLineCount; ++i) for (unsigned int i = 0; i < atis->textLineCount; ++i)
{ {
const QString fixed = cbvar_cast(cbvar)->fromFSD(atis->textLines[i]).trimmed(); const QString fixed = cbvar_cast(cbvar)->fromFSD(atis->textLines[i]).trimmed();
if (! fixed.isEmpty()) if (! fixed.isEmpty())

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

@@ -149,7 +149,7 @@ namespace BlackCore
//! @{ //! @{
static void onConnectionStatusChanged(VatFsdClient *, VatConnectionStatus oldStatus, VatConnectionStatus newStatus, void *cbvar); static void onConnectionStatusChanged(VatFsdClient *, VatConnectionStatus oldStatus, VatConnectionStatus newStatus, void *cbvar);
static void onTextMessageReceived(VatFsdClient *, const char *from, const char *to, const char *msg, void *cbvar); static void onTextMessageReceived(VatFsdClient *, const char *from, const char *to, const char *msg, void *cbvar);
static void onRadioMessageReceived(VatFsdClient *, const char *from, int freqCount, int *freqList, const char *message, void *cbvar); static void onRadioMessageReceived(VatFsdClient *, const char *from, unsigned int freqCount, int *freqList, const char *message, void *cbvar);
static void onControllerDisconnected(VatFsdClient *, const char *callsign, void *cbvar); static void onControllerDisconnected(VatFsdClient *, const char *callsign, void *cbvar);
static void onInterimPilotPositionUpdate(VatFsdClient *, const char *sender, const VatInterimPilotPosition *position, void *cbvar); static void onInterimPilotPositionUpdate(VatFsdClient *, const char *sender, const VatInterimPilotPosition *position, void *cbvar);
static void onAtcPositionUpdate(VatFsdClient *, const char *callsign, const VatAtcPosition *pos, void *cbvar); static void onAtcPositionUpdate(VatFsdClient *, const char *callsign, const VatAtcPosition *pos, void *cbvar);