mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-07-26 03:54:30 -04:00
Replace deprecated QMutex(Recursive) with QRecursiveMutex
This commit is contained in:
@@ -51,7 +51,6 @@ MESSAGE_CLASS_DEFINITION(RemoteInput::MsgRequestFixedData, Message)
|
||||
RemoteInput::RemoteInput(DeviceAPI *deviceAPI) :
|
||||
m_deviceAPI(deviceAPI),
|
||||
m_sampleRate(48000),
|
||||
m_mutex(QMutex::Recursive),
|
||||
m_settings(),
|
||||
m_remoteInputUDPHandler(nullptr),
|
||||
m_deviceDescription("RemoteInput"),
|
||||
|
||||
@@ -403,7 +403,7 @@ public:
|
||||
private:
|
||||
DeviceAPI *m_deviceAPI;
|
||||
int m_sampleRate;
|
||||
QMutex m_mutex;
|
||||
QRecursiveMutex m_mutex;
|
||||
RemoteInputSettings m_settings;
|
||||
RemoteChannelSettings m_remoteChannelSettings;
|
||||
RemoteInputUDPHandler* m_remoteInputUDPHandler;
|
||||
|
||||
@@ -44,7 +44,6 @@ MESSAGE_CLASS_DEFINITION(RemoteTCPInput::MsgReportTCPBuffer, Message)
|
||||
|
||||
RemoteTCPInput::RemoteTCPInput(DeviceAPI *deviceAPI) :
|
||||
m_deviceAPI(deviceAPI),
|
||||
m_mutex(QMutex::Recursive),
|
||||
m_settings(),
|
||||
m_remoteInputTCPPHandler(nullptr),
|
||||
m_deviceDescription("RemoteTCPInput")
|
||||
|
||||
@@ -177,7 +177,7 @@ public:
|
||||
|
||||
private:
|
||||
DeviceAPI *m_deviceAPI;
|
||||
QMutex m_mutex;
|
||||
QRecursiveMutex m_mutex;
|
||||
RemoteTCPInputSettings m_settings;
|
||||
RemoteTCPInputTCPHandler* m_remoteInputTCPPHandler;
|
||||
QString m_deviceDescription;
|
||||
|
||||
@@ -43,7 +43,6 @@ RemoteTCPInputTCPHandler::RemoteTCPInputTCPHandler(SampleSinkFifo *sampleFifo, D
|
||||
m_reconnectTimer(this),
|
||||
m_converterBuffer(nullptr),
|
||||
m_converterBufferNbSamples(0),
|
||||
m_mutex(QMutex::Recursive),
|
||||
m_settings()
|
||||
{
|
||||
m_tcpBuf = new char[m_sampleFifo->size()*2*4];
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <QObject>
|
||||
#include <QTcpSocket>
|
||||
#include <QHostAddress>
|
||||
#include <QMutex>
|
||||
#include <QRecursiveMutex>
|
||||
#include <QDateTime>
|
||||
|
||||
#include "util/messagequeue.h"
|
||||
@@ -138,7 +138,7 @@ private:
|
||||
int32_t *m_converterBuffer;
|
||||
uint32_t m_converterBufferNbSamples;
|
||||
|
||||
QMutex m_mutex;
|
||||
QRecursiveMutex m_mutex;
|
||||
RemoteTCPInputSettings m_settings;
|
||||
|
||||
void applyTCPLink(const QString& address, quint16 port);
|
||||
|
||||
@@ -60,7 +60,6 @@ TestSourceWorker::TestSourceWorker(SampleSinkFifo* sampleFifo, QObject* parent)
|
||||
m_fcPosShift(0),
|
||||
m_throttlems(TESTSOURCE_THROTTLE_MS),
|
||||
m_throttleToggle(false),
|
||||
m_mutex(QMutex::Recursive),
|
||||
m_histoCounter(0)
|
||||
{
|
||||
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
|
||||
|
||||
@@ -105,7 +105,7 @@ private:
|
||||
QTimer m_timer;
|
||||
QElapsedTimer m_elapsedTimer;
|
||||
bool m_throttleToggle;
|
||||
QMutex m_mutex;
|
||||
QRecursiveMutex m_mutex;
|
||||
|
||||
MessageQueue m_inputMessageQueue;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user