Rename vatlib2 to vatlib (v0.9.5)

refs #468

mkspecs/features/libraries.pri

@@ -31,7 +31,7 @@ blackcore {
         macx-clang:     PRE_TARGETDEPS += $$DestRoot/lib/libblackcore.dylib
     }
 
-    LIBS *= -lblackcore -lvatlib2
+    LIBS *= -lblackcore -lvatlib
 
     win32 {
         contains(BLACK_CONFIG, FSX) {

src/blackcore/audiodevicevatlib.cpp

@@ -30,7 +30,7 @@ namespace BlackCore
         : IAudioInputDevice(parent),
           m_audioService(audioService)
     {
-        m_inputCodec.reset(Vat_CreateLocalInputCodec(audioService));
+        m_inputCodec.reset(Vat_CreateLocalInputCodec(audioService, vatCodecLegacy));
         Vat_GetInputDeviceInfo(m_inputCodec.data(), onInputHardwareDeviceReceived, this, nullptr);
         m_currentDevice = getDefaultInputDevice();
     }
@@ -77,7 +77,7 @@ namespace BlackCore
          : IAudioOutputDevice(parent),
            m_audioService(audioService)
     {
-        m_outputCodec.reset(Vat_CreateLocalOutputCodec(m_audioService));
+        m_outputCodec.reset(Vat_CreateLocalOutputCodec(m_audioService, vatCodecLegacy));
         Vat_GetOutputDeviceInfo(m_outputCodec.data(), onOutputHardwareDeviceReceived, this, nullptr);
         m_currentDevice = getDefaultOutputDevice();
     }

src/blackcore/audiodevicevatlib.h

@@ -16,7 +16,7 @@
 #include "audiodevice.h"
 #include "blackmisc/audio/audiodeviceinfo.h"
 #include "blackmisc/audio/audiodeviceinfolist.h"
-#include "vatlib/vatlib2.h"
+#include "vatlib/vatlib.h"
 #include <QObject>
 
 namespace BlackCore

src/blackcore/audiomixervatlib.h

@@ -13,7 +13,7 @@
 #include "blackcoreexport.h"
 #include "audiomixer.h"
 
-#include "vatlib/vatlib2.h"
+#include "vatlib/vatlib.h"
 #include <QScopedPointer>
 
 namespace BlackCore

src/blackcore/blackcore.pro

@@ -30,7 +30,7 @@ SOURCES += *.cpp
 # SOURCES += $$PWD/settings/*.cpp
 SOURCES += $$PWD/data/*.cpp
 
-LIBS *= -lvatlib2
+LIBS *= -lvatlib
 
 DESTDIR = $$DestRoot/lib
 DLLDESTDIR = $$DestRoot/bin

src/blackcore/networkvatlib.cpp

@@ -15,7 +15,7 @@
 #include <type_traits>
 
 static_assert(! std::is_abstract<BlackCore::CNetworkVatlib>::value, "Must implement all pure virtuals");
-static_assert(VAT_LIBVATLIB_VERSION == 904, "Wrong vatlib header installed");
+static_assert(VAT_LIBVATLIB_VERSION == 905, "Wrong vatlib header installed");
 
 // TODO just placeholders to allow this to compile
 // This is just a test key and is NOT valid on the live network.

src/blackcore/networkvatlib.h

@@ -17,7 +17,7 @@
 #include "settings/network.h"
 #include "blackmisc/simulation/ownaircraftprovider.h"
 #include "tokenbucket.h"
-#include <vatlib/vatlib2.h>
+#include <vatlib/vatlib.h>
 #include <QScopedPointer>
 #include <QTimer>
 #include <QTextCodec>

src/blackcore/voicevatlib.h

@@ -14,7 +14,7 @@
 
 #include "blackcoreexport.h"
 #include "voice.h"
-#include <vatlib/vatlib2.h>
+#include <vatlib/vatlib.h>
 
 #include <QString>
 #include <QScopedPointer>