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

Added class CVoiceRoom

Browse Source 
refs #36
- This class encapsulates the information on a voice server room.
- It basically consists of the tuple hostname and channel

refs #81
This commit is contained in:
Roland Winklmeier
2013-11-28 22:43:33 +01:00
committed by Mathew Sutcliffe
parent 62e1b411c5
commit fcebc44b02
5 changed files with 240 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackcore/voiceclient.h
View File

@@ -12,6 +12,7 @@
#include "../blackmisc/context.h"
#include "../blackmisc/avcallsign.h"
#include "../blackmisc/vvoiceroom.h"
#include <vatlib/vatlib.h>
@@ -45,8 +46,8 @@ namespace BlackCore
virtual ~IVoiceClient() {}
virtual void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0;
virtual void joinVoiceServer(const uint32_t comUnit, const QString &serverSpec) = 0;
virtual void leaveVoiceServer(const uint32_t comUnit) = 0;
virtual void joinVoiceRoom(const uint32_t comUnit, const BlackMisc::Voice::CVoiceRoom &voiceRoom) = 0;
virtual void leaveVoiceRoom(const uint32_t comUnit) = 0;
virtual void setVolume(const uint32_t comUnit, const uint32_t volumne) = 0;
virtual void startTransmitting(const uint32_t comUnit) = 0;
virtual void stopTransmitting(const uint32_t comUnit) = 0;
@@ -57,6 +58,8 @@ namespace BlackCore
virtual void getInputDevices(const uint32_t comUnit) = 0;
virtual void getOutputDevices(const uint32_t comUnit) = 0;
virtual const BlackMisc::Voice::CVoiceRoom &voiceRoom (const uint32_t comUnit) = 0;
signals:
void notConnected(const uint32_t comUnit);
void connecting(const uint32_t comUnit);

4
src/blackcore/voiceclient_vatlib.cpp
View File

@@ -69,12 +69,12 @@ namespace BlackCore
}
void CVoiceClientVatlib::onRoomStatusUpdate(Cvatlib_Voice_Simple *obj, roomStatusUpdate upd, int32_t roomIndex, void *cbVar)
void CVoiceClientVatlib::onRoomStatusUpdate(Cvatlib_Voice_Simple *obj, Cvatlib_Voice_Simple::roomStatusUpdate upd, int32_t roomIndex, void *cbVar)
{
}
void CVoiceClientVatlib::onRoomUserReceived(vatlib_Voice_Simple *obj, const char *name, void *cbVar)
void CVoiceClientVatlib::onRoomUserReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar)
{
}

6
src/blackcore/voiceclient_vatlib.h
View File

@@ -9,6 +9,7 @@
#include "voiceclient.h"
#include <QScopedPointer>
#include <QMap>
namespace BlackCore
{
@@ -41,12 +42,13 @@ namespace BlackCore
private:
// shimlib callbacks
void onRoomStatusUpdate(Cvatlib_Voice_Simple* obj, roomStatusUpdate upd, INT roomIndex, void* cbVar);
void onRoomUserReceived(vatlib_Voice_Simple* obj, const char* name, void* cbVar);
void onRoomStatusUpdate(Cvatlib_Voice_Simple* obj, Cvatlib_Voice_Simple::roomStatusUpdate upd, INT roomIndex, void* cbVar);
void onRoomUserReceived(Cvatlib_Voice_Simple* obj, const char* name, void* cbVar);
void onHardwareDeviceReceived(Cvatlib_Voice_Simple* obj, const char* name, void* cbVar);
QScopedPointer<Cvatlib_Voice_Simple> m_voice;
BlackMisc::Aviation::CCallsign m_callsign;
QMap<uint32_t, BlackMisc::Voice::CVoiceRoom> m_voiceRoomMap;
};