flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 17:55:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename vatlib2 to vatlib (v0.9.5)

Browse Source 
refs #468
This commit is contained in:
Roland Winklmeier
2015-11-22 21:13:27 +01:00
parent b97a04373e
commit e51757cbf8
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: cd6142faf6...197cbb108e

2
mkspecs/features/libraries.pri
View File

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

4
src/blackcore/audiodevicevatlib.cpp
View File

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

2
src/blackcore/audiodevicevatlib.h
View File

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

2
src/blackcore/audiomixervatlib.h
View File

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

2
src/blackcore/blackcore.pro
View File

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

2
src/blackcore/networkvatlib.cpp
View File

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

2
src/blackcore/networkvatlib.h
View File

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

2
src/blackcore/voicevatlib.h
View File

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