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

refs #255 Use QMutex and std::atomic instead of QReadWriteLock

Browse Source
This commit is contained in:
Roland Winklmeier
2014-08-03 16:09:36 +02:00
parent 94e0c61e97
commit c8f41beea9
2 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/blackcore/voice_vatlib.h
View File

@@ -18,6 +18,7 @@
#include <QString>
#include <QMutex>
#include <QReadWriteLock>
#include <atomic>
#include <utility>
#ifdef Q_OS_WIN
@@ -57,6 +58,7 @@ namespace BlackCore
Q_OBJECT
public:
/*!
* \brief Constructor
* \param parent
@@ -238,8 +240,8 @@ namespace BlackCore
BlackMisc::Audio::CAudioDeviceList m_devices; /*!< in and output devices */
BlackMisc::Audio::CAudioDevice m_currentOutputDevice;
BlackMisc::Audio::CAudioDevice m_currentInputDevice;
float m_inputSquelch;
Cvatlib_Voice_Simple::agc m_micTestResult;
std::atomic<float> m_inputSquelch;
std::atomic<Cvatlib_Voice_Simple::agc> m_micTestResult;
QMap <ComUnit, BlackMisc::Aviation::CCallsignList> m_voiceRoomCallsigns; /*!< voice room callsigns */
BlackMisc::Aviation::CCallsignList m_temporaryVoiceRoomCallsigns; /*!< temp. storage of voice rooms during update */
QMap<ComUnit, bool> m_outputEnabled; /*!< output enabled, basically a mute flag */
@@ -253,17 +255,9 @@ namespace BlackCore
const static qint32 InvalidRoomIndex = -1; /*! marks invalid room */
// Thread serialization
mutable QReadWriteLock m_lockVoiceRooms;
mutable QReadWriteLock m_lockCallsigns;
mutable QReadWriteLock m_lockCurrentOutputDevice;
mutable QReadWriteLock m_lockCurrentInputDevice;
mutable QReadWriteLock m_lockDeviceList;
mutable QReadWriteLock m_lockOutputEnabled;
mutable QReadWriteLock m_lockSquelch;
mutable QReadWriteLock m_lockTestResult;
mutable QReadWriteLock m_lockMyCallsign;
mutable QReadWriteLock m_lockConnectionStatus;
mutable QMutex m_lockCurrentOutputDevice;
mutable QMutex m_lockCurrentInputDevice;
mutable QMutex m_lockDeviceList;
};
} // namespace