flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-23 05:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #320 Prepare Voice to new vatlib API

Browse Source
This commit is contained in:
Roland Winklmeier
2014-12-25 20:43:56 +01:00
parent 111c539e89
commit 13a05f729e
4 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/blackcore/voice_vatlib.h
View File

@@ -7,8 +7,10 @@
#define BLACKCORE_VOICE_VATLIB_H
#include "voice.h"
#include <vatlib/vatlib2.h>
#include <QString>
#include <QScopedPointer>
#ifdef Q_OS_WIN
#ifndef NOMINMAX
@@ -86,11 +88,32 @@ namespace BlackCore
private:
// this struct calls "myCustomDeallocator" to delete the pointer
struct VatAudioServiceDeleter
{
static inline void cleanup(VatAudioService_tag *obj)
{
Vat_DestroyAudioService(obj);
}
};
struct VatUDPAudioPortDeleter
{
static inline void cleanup(VatUDPAudioPort_tag *obj)
{
Vat_DestroyUDPAudioPort(obj);
}
};
static void voiceErrorHandler(const char *message);
// shimlib callbacks
static void onRoomStatusUpdate(Cvatlib_Voice_Simple *obj, Cvatlib_Voice_Simple::roomStatusUpdate upd, qint32 roomIndex, void *cbVar);
void onRoomStatusUpdate(qint32 roomIndex, Cvatlib_Voice_Simple::roomStatusUpdate roomStatus);
QScopedPointer<VatAudioService_tag, VatAudioServiceDeleter> m_audioService;
QScopedPointer<VatUDPAudioPort_tag, VatUDPAudioPortDeleter> m_udpPort;
BlackMisc::Audio::CAudioDeviceInfoList m_devices; /*!< in and output devices */
BlackMisc::Audio::CAudioDeviceInfo m_currentOutputDevice;
BlackMisc::Audio::CAudioDeviceInfo m_currentInputDevice;