From a0a082ab9824a633d8d9ef09f4996d94052987e8 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 15 Jan 2014 15:58:29 +0100 Subject: [PATCH 1/3] New signal/slot syntax #96 In this particular case also solving the ASSERT remaining from the pair programming sessiom: this->connect(this->m_network, SIGNAL(connectionStatusChanged(INetwork::ConnectionStatus, INetwork::ConnectionStatus)), this, SLOT(psFsdConnectionStatusChanged(INetwork::ConnectionStatus, INetwork::ConnectionStatus))); Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect connectionStatusChanged"); --- src/blackcore/context_network.cpp | 76 +++++++------------------------ 1 file changed, 16 insertions(+), 60 deletions(-) diff --git a/src/blackcore/context_network.cpp b/src/blackcore/context_network.cpp index 613708a2f..1cd3ead81 100644 --- a/src/blackcore/context_network.cpp +++ b/src/blackcore/context_network.cpp @@ -8,6 +8,7 @@ #include "blackmisc/avatcstationlist.h" #include "blackcore/context_settings_interface.h" #include +#include using namespace BlackMisc; using namespace BlackMisc::PhysicalQuantities; @@ -33,70 +34,25 @@ namespace BlackCore // 3. Init network access driver for XML data (bookings) this->m_networkManager = new QNetworkAccessManager(this); - this->connect(this->m_networkManager, SIGNAL(finished(QNetworkReply *)), this, SLOT(psAtcBookingsRead(QNetworkReply *))); this->m_atcBookingTimer = new QTimer(this); - this->connect(this->m_atcBookingTimer, SIGNAL(timeout()), this, SLOT(readAtcBookingsFromSource())); + this->connect(this->m_networkManager, &QNetworkAccessManager::finished, this, &CContextNetwork::psAtcBookingsRead); + this->connect(this->m_atcBookingTimer, &QTimer::timeout, this, &CContextNetwork::readAtcBookingsFromSource); this->m_atcBookingTimer->start(15 * 1000); - - // 4. connect signals and slots - bool connect; - connect = this->connect(this->m_network, SIGNAL(connectionStatusChanged(INetwork::ConnectionStatus, INetwork::ConnectionStatus)), - this, SLOT(psFsdConnectionStatusChanged(INetwork::ConnectionStatus, INetwork::ConnectionStatus))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect connectionStatusChanged"); - - connect = this->connect(this->m_network, SIGNAL(atcPositionUpdate(BlackMisc::Aviation::CCallsign, BlackMisc::PhysicalQuantities::CFrequency, BlackMisc::Geo::CCoordinateGeodetic, BlackMisc::PhysicalQuantities::CLength)), - this, SLOT(psFsdAtcPositionUpdate(BlackMisc::Aviation::CCallsign, BlackMisc::PhysicalQuantities::CFrequency, BlackMisc::Geo::CCoordinateGeodetic, BlackMisc::PhysicalQuantities::CLength))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect atcPositionUpdate"); - - connect = this->connect(this->m_network, SIGNAL(atisQueryReplyReceived(BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CInformationMessage)), - this, SLOT(psFsdAtisQueryReceived(BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CInformationMessage))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect atis"); - - connect = this->connect(this->m_network, SIGNAL(atisQueryVoiceRoomReplyReceived(BlackMisc::Aviation::CCallsign, QString)), - this, SLOT(psFsdAtisVoiceRoomQueryReceived(BlackMisc::Aviation::CCallsign, QString))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect atis voice room"); - - connect = this->connect(this->m_network, SIGNAL(atisQueryLogoffTimeReplyReceived(BlackMisc::Aviation::CCallsign, QString)), - this, SLOT(psFsdAtisLogoffTimeQueryReceived(BlackMisc::Aviation::CCallsign, QString))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect atis logoff time"); - - connect = this->connect(this->m_network, SIGNAL(metarReceived(QString)), - this, SLOT(psFsdMetarReceived(QString))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect metar"); - - connect = this->connect(this->m_network, SIGNAL(nameQueryReplyReceived(BlackMisc::Aviation::CCallsign, QString)), - this, SLOT(psFsdNameQueryReplyReceived(BlackMisc::Aviation::CCallsign, QString))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect name reply"); - - connect = this->connect(this->m_network, SIGNAL(aircraftInfoReceived(BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftIcao)), - this, SLOT(psFsdAircraftInfoReceived(BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftIcao))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect aircraft info"); - - connect = this->connect(this->m_network, SIGNAL(pilotDisconnected(BlackMisc::Aviation::CCallsign)), - this, SLOT(psFsdPilotDisconnected(BlackMisc::Aviation::CCallsign))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect pilot disconnected"); - - connect = this->connect(this->m_network, SIGNAL(aircraftPositionUpdate(BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CTransponder)), - this, SLOT(psFsdAircraftPositionUpdate(BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftSituation, BlackMisc::Aviation::CTransponder))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect aircraft position update"); - - connect = this->connect(this->m_network, SIGNAL(frequencyQueryReplyReceived(BlackMisc::Aviation::CCallsign, BlackMisc::PhysicalQuantities::CFrequency)), - this, SLOT(psFsdFrequencyReceived(BlackMisc::Aviation::CCallsign, BlackMisc::PhysicalQuantities::CFrequency))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect frequency update"); - - connect = this->connect(this->m_network, SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList)), - this, SLOT(psFsdTextMessageReceived(BlackMisc::Network::CTextMessageList))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect text message"); - - - // relay status message - connect = this->connect(this->m_network, SIGNAL(statusMessage(BlackMisc::CStatusMessage)), - this, SIGNAL(statusMessage(BlackMisc::CStatusMessage))); - Q_ASSERT_X(connect, "CContextNetwork", "Cannot connect status message"); - Q_UNUSED(connect); // no warning in release mode - + this->connect(this->m_network, &INetwork::connectionStatusChanged, this, &CContextNetwork::psFsdConnectionStatusChanged); + this->connect(this->m_network, &INetwork::atcPositionUpdate, this, &CContextNetwork::psFsdAtcPositionUpdate); + this->connect(this->m_network, &INetwork::atisQueryReplyReceived, this, &CContextNetwork::psFsdAtisQueryReceived); + this->connect(this->m_network, &INetwork::atisQueryVoiceRoomReplyReceived, this, &CContextNetwork::psFsdAtisVoiceRoomQueryReceived); + this->connect(this->m_network, &INetwork::atisQueryLogoffTimeReplyReceived, this, &CContextNetwork::psFsdAtisLogoffTimeQueryReceived); + this->connect(this->m_network, &INetwork::metarReceived, this, &CContextNetwork::psFsdMetarReceived); + this->connect(this->m_network, &INetwork::nameQueryReplyReceived, this, &CContextNetwork::psFsdNameQueryReplyReceived); + this->connect(this->m_network, &INetwork::aircraftInfoReceived, this, &CContextNetwork::psFsdAircraftInfoReceived); + this->connect(this->m_network, &INetwork::pilotDisconnected, this, &CContextNetwork::psFsdPilotDisconnected); + this->connect(this->m_network, &INetwork::aircraftPositionUpdate, this, &CContextNetwork::psFsdAircraftPositionUpdate); + this->connect(this->m_network, &INetwork::frequencyQueryReplyReceived, this, &CContextNetwork::psFsdFrequencyReceived); + this->connect(this->m_network, &INetwork::textMessagesReceived, this, &CContextNetwork::psFsdTextMessageReceived); + this->connect(this->m_network, &INetwork::statusMessage, this, &CContextNetwork::statusMessage); } /* From f50fe098e3dbc1c144d44150fe2c9ff36e212160 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 15 Jan 2014 20:39:15 +0100 Subject: [PATCH 2/3] Fix compile error in qFatal caused by type change to QString msg was changed from type "const char*" to QString, but qFatal is still expecting a "const char*" as its argument. Passed the QString value to the qPrintable macro to fix it. --- src/blackcore/network_vatlib.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index 60d707945..edc68bbb0 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -729,7 +729,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)); From e36448f0a1f4cdb8ccc6f64f00fd8f3ce7a417f1 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Wed, 15 Jan 2014 21:12:01 +0100 Subject: [PATCH 3/3] Replaced c++ standard integer types with Qt types In order to be consistent, all standard integer types have been replaced by the equivalent Qt ones in voice/audio code. Projects covered - BlackCore - BlackMisc - sample_voice_client refs #99 --- samples/voiceclient/client.cpp | 4 +-- src/blackcore/network_vatlib.cpp | 2 +- src/blackcore/voice.h | 4 +-- src/blackcore/voice_vatlib.cpp | 44 ++++++++++++++++---------------- src/blackcore/voice_vatlib.h | 12 ++++----- src/blackmisc/vaudiodevice.cpp | 2 +- src/blackmisc/vaudiodevice.h | 14 ++++------ 7 files changed, 39 insertions(+), 43 deletions(-) diff --git a/samples/voiceclient/client.cpp b/samples/voiceclient/client.cpp index b21e485da..91be166e2 100644 --- a/samples/voiceclient/client.cpp +++ b/samples/voiceclient/client.cpp @@ -190,13 +190,13 @@ void Client::connectionStatusDisconnected() void Client::audioStartedStream(const BlackCore::IVoice::ComUnit comUnit) { - std::cout << "Started stream in room index " << static_cast(comUnit) << std::endl; + std::cout << "Started stream in room index " << static_cast(comUnit) << std::endl; printLinePrefix(); } void Client::audioStoppedStream(const BlackCore::IVoice::ComUnit comUnit) { - std::cout << "Stopped stream in room index " << static_cast(comUnit) << std::endl; + std::cout << "Stopped stream in room index " << static_cast(comUnit) << std::endl; printLinePrefix(); } diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index edc68bbb0..dc459c37c 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -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(m_ownAircraft.getTransponderCode()); + pos.xpdrCode = static_cast(m_ownAircraft.getTransponderCode()); pos.xpdrMode = Cvatlib_Network::xpndrMode_Standby; switch (m_ownAircraft.getTransponderMode()) { diff --git a/src/blackcore/voice.h b/src/blackcore/voice.h index ff759be19..12278c1be 100644 --- a/src/blackcore/voice.h +++ b/src/blackcore/voice.h @@ -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 diff --git a/src/blackcore/voice_vatlib.cpp b/src/blackcore/voice_vatlib.cpp index f59010d46..5e0f65032 100644 --- a/src/blackcore/voice_vatlib.cpp +++ b/src/blackcore/voice_vatlib.cpp @@ -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(COM1))); - com2.setConnected(m_voice->IsRoomConnected(static_cast(COM2))); - com1.setAudioPlaying(com1.isConnected() ? m_voice->IsAudioPlaying(static_cast(COM1)) : false); - com2.setAudioPlaying(com2.isConnected() ? m_voice->IsAudioPlaying(static_cast(COM2)) : false); + com1.setConnected(m_voice->IsRoomConnected(static_cast(COM1))); + com2.setConnected(m_voice->IsRoomConnected(static_cast(COM2))); + com1.setAudioPlaying(com1.isConnected() ? m_voice->IsAudioPlaying(static_cast(COM1)) : false); + com2.setAudioPlaying(com2.isConnected() ? m_voice->IsAudioPlaying(static_cast(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(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); + Q_ASSERT_X(m_voice->IsRoomValid(static_cast(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); try { - m_voice->SetOutoutState(static_cast(comUnit), 0, enable); + m_voice->SetOutoutState(static_cast(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(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); + Q_ASSERT_X(m_voice->IsRoomValid(static_cast(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(comUnit), m_aircraftCallsign.toQString().toLatin1().constData(), serverSpec.toLatin1().constData()); + m_voice->JoinRoom(static_cast(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(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); + Q_ASSERT_X(m_voice->IsRoomValid(static_cast(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); try { - m_voice->LeaveRoom(static_cast(comUnit)); + m_voice->LeaveRoom(static_cast(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(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); + Q_ASSERT_X(m_voice->IsRoomValid(static_cast(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); try { - m_voice->SetRoomVolume(static_cast(comUnit), volumne); + m_voice->SetRoomVolume(static_cast(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(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); + Q_ASSERT_X(m_voice->IsRoomValid(static_cast(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); try { - m_voice->SetMicState(static_cast(comUnit), true); + m_voice->SetMicState(static_cast(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(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); + Q_ASSERT_X(m_voice->IsRoomValid(static_cast(comUnit)), "CVoiceClientVatlib", "Room index out of bounds!"); try { - m_voice->SetMicState(static_cast(comUnit), false); + m_voice->SetMicState(static_cast(comUnit), false); } catch (...) { @@ -504,15 +504,15 @@ namespace BlackCore try { // Paranoia... - if (!m_voice->IsRoomConnected(static_cast(comUnit))) + if (!m_voice->IsRoomConnected(static_cast(comUnit))) return; // Store the room index for the slot (called in static callback) - m_temporaryUserRoomIndex = static_cast(comUnit); + m_temporaryUserRoomIndex = static_cast(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(comUnit), onRoomUserReceived, this); + m_voice->GetRoomUserList(static_cast(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(roomIndex); diff --git a/src/blackcore/voice_vatlib.h b/src/blackcore/voice_vatlib.h index d5e99324d..b4a5e3004 100644 --- a/src/blackcore/voice_vatlib.h +++ b/src/blackcore/voice_vatlib.h @@ -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 */ }; diff --git a/src/blackmisc/vaudiodevice.cpp b/src/blackmisc/vaudiodevice.cpp index 1f9c291c8..7208d5c36 100644 --- a/src/blackmisc/vaudiodevice.cpp +++ b/src/blackmisc/vaudiodevice.cpp @@ -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()) { diff --git a/src/blackmisc/vaudiodevice.h b/src/blackmisc/vaudiodevice.h index 581526f3b..159518f20 100644 --- a/src/blackmisc/vaudiodevice.h +++ b/src/blackmisc/vaudiodevice.h @@ -13,10 +13,6 @@ #include "valueobject.h" #include -#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;