From dd7ac31388ebdf71d387fc17c4398a2bba567099 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 29 May 2019 18:11:56 -0400 Subject: [PATCH] 2019-05-29 Fred Gleason * Removed 'Q3SocketDevice' dependency from caed(8). --- ChangeLog | 2 ++ cae/cae.cpp | 8 ++++---- cae/cae.h | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dec275c..f0c4cbf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18699,3 +18699,5 @@ 2019-05-29 Fred Gleason * Refactored caed(8) to eliminate arbitrary limit on number of client connections. +2019-05-29 Fred Gleason + * Removed 'Q3SocketDevice' dependency from caed(8). diff --git a/cae/cae.cpp b/cae/cae.cpp index e8d63f98..ff8ac41e 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -237,9 +237,9 @@ MainObject::MainObject(QObject *parent,const char *name) signal(SIGTERM,SigHandler); // - // Allocate Meter Socket + // Meter Socket // - meter_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); + meter_socket=new QUdpSocket(this); // // Open Database @@ -2171,8 +2171,8 @@ void MainObject::SendMeterOutputStatusUpdate(int card,int port,int stream) void MainObject::SendMeterUpdate(const QString &msg,int conn_id) { - meter_socket->writeBlock(msg,msg.length(),cae_server->peerAddress(conn_id), - cae_server->meterPort(conn_id)); + meter_socket->writeDatagram(msg,msg.length(),cae_server->peerAddress(conn_id), + cae_server->meterPort(conn_id)); } diff --git a/cae/cae.h b/cae/cae.h index 343f9363..0ab467b4 100644 --- a/cae/cae.h +++ b/cae/cae.h @@ -29,10 +29,10 @@ #include #include -#include #include #include #include +#include #include @@ -172,7 +172,7 @@ class MainObject : public QObject unsigned system_sample_rate; CaeServer *cae_server; Q_INT16 tcp_port; - Q3SocketDevice *meter_socket; + QUdpSocket *meter_socket; RDStation::AudioDriver cae_driver[RD_MAX_CARDS]; int record_owner[RD_MAX_CARDS][RD_MAX_STREAMS]; int record_length[RD_MAX_CARDS][RD_MAX_STREAMS];