diff --git a/externals b/externals index fc3fd64ee..83d148740 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit fc3fd64ee73491dd0c339be5c28ae99520878a07 +Subproject commit 83d1487407bca25edbfb4c2ff03fdd2e59c40273 diff --git a/installer/installbuilder/swift-externals.xml b/installer/installbuilder/swift-externals.xml index f70195276..d89b5e4c6 100644 --- a/installer/installbuilder/swift-externals.xml +++ b/installer/installbuilder/swift-externals.xml @@ -6,7 +6,6 @@ - vatlib - speex - speexdsp -- opus - portaudio 1 1 @@ -33,10 +32,6 @@ 1 ../../dist/bin/*speexdsp*.dll - - 1 - ../../dist/bin/*opus*.dll - 1 ../../dist/bin/*swift_crashpad_handler.exe @@ -63,10 +58,6 @@ ../../dist/lib/libvatlib.so - - 1 - ../../dist/lib/libopus.so.* - 1 ../../dist/lib/libportaudio.so.* @@ -83,9 +74,6 @@ lib_osx osx - - ../../dist/lib/libopus.0.dylib - ../../dist/lib/libportaudio.dylib diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index 393313379..6b050dc60 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -62,7 +62,7 @@ #include static_assert(! std::is_abstract::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 BlackMisc; @@ -858,13 +858,13 @@ namespace BlackCore 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); const int com1 = self->getOwnAircraft().getCom1System().getFrequencyActive().valueInteger(CFrequencyUnit::kHz()); const int com2 = self->getOwnAircraft().getCom2System().getFrequencyActive().valueInteger(CFrequencyUnit::kHz()); QList frequencies; - for (int i = 0; i < numFreq; ++i) + for (unsigned int i = 0; i < numFreq; ++i) { if (freqList[i] == com1 || freqList[i] == com2) { @@ -1281,7 +1281,7 @@ namespace BlackCore CInformationMessage atisMessage; 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(); if (! fixed.isEmpty()) diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h index 510769206..3f5c34f4b 100644 --- a/src/blackcore/vatsim/networkvatlib.h +++ b/src/blackcore/vatsim/networkvatlib.h @@ -149,7 +149,7 @@ namespace BlackCore //! @{ 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 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 onInterimPilotPositionUpdate(VatFsdClient *, const char *sender, const VatInterimPilotPosition *position, void *cbvar); static void onAtcPositionUpdate(VatFsdClient *, const char *callsign, const VatAtcPosition *pos, void *cbvar);