From e51757cbf8a2e8cb37deed9e670a678cc38bd89d Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Sun, 22 Nov 2015 21:13:27 +0100
Subject: [PATCH] Rename vatlib2 to vatlib (v0.9.5)

refs #468
---
 externals                           | 2 +-
 mkspecs/features/libraries.pri      | 2 +-
 src/blackcore/audiodevicevatlib.cpp | 4 ++--
 src/blackcore/audiodevicevatlib.h   | 2 +-
 src/blackcore/audiomixervatlib.h    | 2 +-
 src/blackcore/blackcore.pro         | 2 +-
 src/blackcore/networkvatlib.cpp     | 2 +-
 src/blackcore/networkvatlib.h       | 2 +-
 src/blackcore/voicevatlib.h         | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/externals b/externals
index cd6142faf..197cbb108 160000
--- a/externals
+++ b/externals
@@ -1 +1 @@
-Subproject commit cd6142faf618253c556a6959286548d984d004cb
+Subproject commit 197cbb108e5d52aab2c66e9ea218a401f4faeee6
diff --git a/mkspecs/features/libraries.pri b/mkspecs/features/libraries.pri
index e09ad6453..6de344985 100644
--- a/mkspecs/features/libraries.pri
+++ b/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) {
diff --git a/src/blackcore/audiodevicevatlib.cpp b/src/blackcore/audiodevicevatlib.cpp
index 17a95a220..6f7e29d83 100644
--- a/src/blackcore/audiodevicevatlib.cpp
+++ b/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();
     }
diff --git a/src/blackcore/audiodevicevatlib.h b/src/blackcore/audiodevicevatlib.h
index 4629dec06..269739c6e 100644
--- a/src/blackcore/audiodevicevatlib.h
+++ b/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
diff --git a/src/blackcore/audiomixervatlib.h b/src/blackcore/audiomixervatlib.h
index 9a76f7fc6..18048936c 100644
--- a/src/blackcore/audiomixervatlib.h
+++ b/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
diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro
index eca0d784f..69ffa3dba 100644
--- a/src/blackcore/blackcore.pro
+++ b/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
diff --git a/src/blackcore/networkvatlib.cpp b/src/blackcore/networkvatlib.cpp
index 8dc9d8588..469b44f46 100644
--- a/src/blackcore/networkvatlib.cpp
+++ b/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.
diff --git a/src/blackcore/networkvatlib.h b/src/blackcore/networkvatlib.h
index f045c1214..07f4ea372 100644
--- a/src/blackcore/networkvatlib.h
+++ b/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>
diff --git a/src/blackcore/voicevatlib.h b/src/blackcore/voicevatlib.h
index 7d6c7aaed..dccc8b59f 100644
--- a/src/blackcore/voicevatlib.h
+++ b/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>