flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

Browse Source
This commit is contained in:
Klaus Basan
2014-01-16 02:05:57 +01:00
parent 34ef6e47ae e36448f0a1
commit bddf54d770
7 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/network_vatlib.cpp
View File

@@ -146,7 +146,7 @@ namespace BlackCore
pos.lon = m_ownAircraft.longitude().value(CAngleUnit::deg());
pos.groundSpeed = m_ownAircraft.getGroundSpeed().value(CSpeedUnit::kts());
pos.rating = Cvatlib_Network::pilotRating_Unknown;
pos.xpdrCode = static_cast<int16_t>(m_ownAircraft.getTransponderCode());
pos.xpdrCode = static_cast<qint16>(m_ownAircraft.getTransponderCode());
pos.xpdrMode = Cvatlib_Network::xpndrMode_Standby;
switch (m_ownAircraft.getTransponderMode())
{
@@ -724,7 +724,7 @@ namespace BlackCore
case Cvatlib_Network::error_Registered:
case Cvatlib_Network::error_InvalidControl: msg = "Server: "; msg.append(cbvar_cast(cbvar)->fromFSD(msgData)); break;
default: qFatal("VATSIM shim library: %s (error %d)", msg, type); goto terminate;
default: qFatal("VATSIM shim library: %s (error %d)", qPrintable(msg), type); goto terminate;
}
emit cbvar_cast(cbvar)->statusMessage(BlackMisc::CStatusMessage(BlackMisc::CStatusMessage::TypeTrafficNetwork, BlackMisc::CStatusMessage::SeverityInfo, msg));

4
src/blackcore/voice.h
View File

@@ -108,7 +108,7 @@ namespace BlackCore
/*!
\return Result of the mic test.
*/
virtual int32_t micTestResult() const = 0;
virtual qint32 micTestResult() const = 0;
//! micTestResult
/*!
@@ -166,7 +166,7 @@ namespace BlackCore
* \param comUnit
* \param volumne
*/
virtual void setRoomOutputVolume(const ComUnit comUnit, const int32_t volumne) = 0;
virtual void setRoomOutputVolume(const ComUnit comUnit, const qint32 volumne) = 0;
/*!
* \brief Start transmitting

44
src/blackcore/voice_vatlib.cpp
View File

@@ -154,10 +154,10 @@ namespace BlackCore
// valid state, update
CVoiceRoom com1 = this->m_voiceRooms[0];
CVoiceRoom com2 = this->m_voiceRooms[1];
com1.setConnected(m_voice->IsRoomConnected(static_cast<int32_t>(COM1)));
com2.setConnected(m_voice->IsRoomConnected(static_cast<int32_t>(COM2)));
com1.setAudioPlaying(com1.isConnected() ? m_voice->IsAudioPlaying(static_cast<int32_t>(COM1)) : false);
com2.setAudioPlaying(com2.isConnected() ? m_voice->IsAudioPlaying(static_cast<int32_t>(COM2)) : false);
com1.setConnected(m_voice->IsRoomConnected(static_cast<qint32>(COM1)));
com2.setConnected(m_voice->IsRoomConnected(static_cast<qint32>(COM2)));
com1.setAudioPlaying(com1.isConnected() ? m_voice->IsAudioPlaying(static_cast<qint32>(COM1)) : false);
com2.setAudioPlaying(com2.isConnected() ? m_voice->IsAudioPlaying(static_cast<qint32>(COM2)) : false);
this->setVoiceRoomForUnit(COM1, com1);
this->setVoiceRoomForUnit(COM2, com2);
}
@@ -170,10 +170,10 @@ namespace BlackCore
void CVoiceVatlib::switchAudioOutput(const ComUnit comUnit, bool enable)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceClientVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<int32_t>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<qint32>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
try
{
m_voice->SetOutoutState(static_cast<int32_t>(comUnit), 0, enable);
m_voice->SetOutoutState(static_cast<qint32>(comUnit), 0, enable);
this->m_outputEnabled[comUnit] = enable;
}
catch (...)
@@ -233,7 +233,7 @@ namespace BlackCore
/*
* Mic test
*/
int32_t CVoiceVatlib::micTestResult() const
qint32 CVoiceVatlib::micTestResult() const
{
return m_micTestResult;
}
@@ -283,7 +283,7 @@ namespace BlackCore
void CVoiceVatlib::joinVoiceRoom(const ComUnit comUnit, const BlackMisc::Voice::CVoiceRoom &voiceRoom)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceClientVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<int32_t>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<qint32>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
if (!voiceRoom.isValid())
{
@@ -299,7 +299,7 @@ namespace BlackCore
vr.setConnected(true);
this->setVoiceRoomForUnit(comUnit, vr);
QString serverSpec = voiceRoom.getVoiceRoomUrl();
m_voice->JoinRoom(static_cast<int32_t>(comUnit), m_aircraftCallsign.toQString().toLatin1().constData(), serverSpec.toLatin1().constData());
m_voice->JoinRoom(static_cast<qint32>(comUnit), m_aircraftCallsign.toQString().toLatin1().constData(), serverSpec.toLatin1().constData());
}
catch (...)
{
@@ -316,11 +316,11 @@ namespace BlackCore
if (!vr.isConnected()) return;
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceClientVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<int32_t>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<qint32>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
try
{
m_voice->LeaveRoom(static_cast<int32_t>(comUnit));
m_voice->LeaveRoom(static_cast<qint32>(comUnit));
vr.setConnected(false);
this->setVoiceRoomForUnit(comUnit, vr);
}
@@ -342,14 +342,14 @@ namespace BlackCore
/*
* Room output volume as per COM unit
*/
void CVoiceVatlib::setRoomOutputVolume(const ComUnit comUnit, const int32_t volumne)
void CVoiceVatlib::setRoomOutputVolume(const ComUnit comUnit, const qint32 volumne)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceClientVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<int32_t>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<qint32>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
try
{
m_voice->SetRoomVolume(static_cast<int32_t>(comUnit), volumne);
m_voice->SetRoomVolume(static_cast<qint32>(comUnit), volumne);
}
catch (...)
{
@@ -363,11 +363,11 @@ namespace BlackCore
void CVoiceVatlib::startTransmitting(const ComUnit comUnit)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceClientVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<int32_t>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<qint32>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
try
{
m_voice->SetMicState(static_cast<int32_t>(comUnit), true);
m_voice->SetMicState(static_cast<qint32>(comUnit), true);
}
catch (...)
{
@@ -381,10 +381,10 @@ namespace BlackCore
void CVoiceVatlib::stopTransmitting(const ComUnit comUnit)
{
Q_ASSERT_X(m_voice->IsValid() && m_voice->IsSetup(), "CVoiceClientVatlib", "Cvatlib_Voice_Simple invalid or not setup!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<int32_t>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
Q_ASSERT_X(m_voice->IsRoomValid(static_cast<qint32>(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!");
try
{
m_voice->SetMicState(static_cast<int32_t>(comUnit), false);
m_voice->SetMicState(static_cast<qint32>(comUnit), false);
}
catch (...)
{
@@ -504,15 +504,15 @@ namespace BlackCore
try
{
// Paranoia...
if (!m_voice->IsRoomConnected(static_cast<int32_t>(comUnit)))
if (!m_voice->IsRoomConnected(static_cast<qint32>(comUnit)))
return;
// Store the room index for the slot (called in static callback)
m_temporaryUserRoomIndex = static_cast<int32_t>(comUnit);
m_temporaryUserRoomIndex = static_cast<qint32>(comUnit);
// Callbacks completed when function is called, after the method is done
// m_voiceRoomCallsignsUpdate is filled with the latest callsigns
m_voice->GetRoomUserList(static_cast<int32_t>(comUnit), onRoomUserReceived, this);
m_voice->GetRoomUserList(static_cast<qint32>(comUnit), onRoomUserReceived, this);
m_temporaryUserRoomIndex = CVoiceVatlib::InvalidRoomIndex; // reset
// we have all current users in m_voi
@@ -560,7 +560,7 @@ namespace BlackCore
/*
* Room status update
*/
void CVoiceVatlib::onRoomStatusUpdate(Cvatlib_Voice_Simple *obj, Cvatlib_Voice_Simple::roomStatusUpdate upd, int32_t roomIndex, void *cbVar)
void CVoiceVatlib::onRoomStatusUpdate(Cvatlib_Voice_Simple *obj, Cvatlib_Voice_Simple::roomStatusUpdate upd, qint32 roomIndex, void *cbVar)
{
Q_UNUSED(obj)
ComUnit comUnit = static_cast<ComUnit>(roomIndex);

12
src/blackcore/voice_vatlib.h
View File

@@ -55,7 +55,7 @@ namespace BlackCore
virtual void runMicTest();
virtual float inputSquelch() const;
virtual int32_t micTestResult() const;
virtual qint32 micTestResult() const;
virtual QString micTestResultAsString() const;
@@ -89,7 +89,7 @@ namespace BlackCore
* \param comUnit
* \param volumne
*/
virtual void setRoomOutputVolume(const ComUnit comUnit, const int32_t volumne);
virtual void setRoomOutputVolume(const ComUnit comUnit, const qint32 volumne);
/*!
* \brief Start transmitting ("talk")
@@ -158,7 +158,7 @@ namespace BlackCore
* \brief Voice room index
* \return
*/
int32_t temporaryUserRoomIndex() const
qint32 temporaryUserRoomIndex() const
{
return m_temporaryUserRoomIndex;
}
@@ -196,7 +196,7 @@ namespace BlackCore
private:
// shimlib callbacks
static void onRoomStatusUpdate(Cvatlib_Voice_Simple *obj, Cvatlib_Voice_Simple::roomStatusUpdate upd, int32_t roomIndex, void *cbVar);
static void onRoomStatusUpdate(Cvatlib_Voice_Simple *obj, Cvatlib_Voice_Simple::roomStatusUpdate upd, qint32 roomIndex, void *cbVar);
static void onRoomUserReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar);
static void onInputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar);
static void onOutputHardwareDeviceReceived(Cvatlib_Voice_Simple *obj, const char *name, void *cbVar);
@@ -302,8 +302,8 @@ namespace BlackCore
// Need to keep the roomIndex?
// KB: I would remove this approach, it is potentially unsafe
// Maybe just use 2 "wrapper" callbacks, which then set explicitly the voice room (it is only 2 methods)
int32_t m_temporaryUserRoomIndex; /*!< temp. storage of voice room, in order to retrieve it in static callback */
const static int32_t InvalidRoomIndex = -1; /*! marks invalid room */
qint32 m_temporaryUserRoomIndex; /*!< temp. storage of voice room, in order to retrieve it in static callback */
const static qint32 InvalidRoomIndex = -1; /*! marks invalid room */
};

2
src/blackmisc/vaudiodevice.cpp
View File

@@ -28,7 +28,7 @@ namespace BlackMisc
/*
* Constructor
*/
CAudioDevice::CAudioDevice(DeviceType type, const int16_t index, const QString &name) :
CAudioDevice::CAudioDevice(DeviceType type, const qint16 index, const QString &name) :
m_type(type), m_deviceIndex(index),
m_deviceName(name), m_hostName(CAudioDevice::hostName())
{

14
src/blackmisc/vaudiodevice.h
View File

@@ -13,10 +13,6 @@
#include "valueobject.h"
#include <QString>
#ifdef Q_OS_WIN
typedef short int16_t;
#endif
namespace BlackMisc
{
namespace Voice
@@ -50,7 +46,7 @@ namespace BlackMisc
/*!
* Constructor.
*/
CAudioDevice(DeviceType type, const int16_t index, const QString &getName);
CAudioDevice(DeviceType type, const qint16 index, const QString &getName);
/*!
* \brief QVariant, required for DBus QVariant lists
@@ -65,7 +61,7 @@ namespace BlackMisc
* Get the device index
* \return
*/
int16_t getIndex() const { return m_deviceIndex; }
qint16 getIndex() const { return m_deviceIndex; }
/*!
* Get the device name
@@ -113,13 +109,13 @@ namespace BlackMisc
* \brief Device type
* \return
*/
static int16_t defaultDevice() {return -1;}
static qint16 defaultDevice() {return -1;}
/*!
* \brief Device type
* \return
*/
static int16_t invalidDevice() {return -2;}
static qint16 invalidDevice() {return -2;}
protected:
@@ -148,7 +144,7 @@ namespace BlackMisc
* The managing class needs to take care, that indexes are valid.
*/
DeviceType m_type;
int16_t m_deviceIndex;
qint16 m_deviceIndex;
QString m_deviceName;
QString m_hostName;