Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-01 00:22:38 +02:00
Code Issues Projects Releases Wiki Activity

2019-05-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed 'Q3SocketDevice' dependency from caed(8).
This commit is contained in:
Fred Gleason 2019-05-29 18:11:56 -04:00
parent f21366bdd4
commit dd7ac31388
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18699,3 +18699,5 @@
2019-05-29 Fred Gleason <fredg@paravelsystems.com> 2019-05-29 Fred Gleason <fredg@paravelsystems.com>
* Refactored caed(8) to eliminate arbitrary limit on number of * Refactored caed(8) to eliminate arbitrary limit on number of
client connections. client connections.
2019-05-29 Fred Gleason <fredg@paravelsystems.com>
* Removed 'Q3SocketDevice' dependency from caed(8).

6
cae/cae.cpp
View File

@ -237,9 +237,9 @@ MainObject::MainObject(QObject *parent,const char *name)
signal(SIGTERM,SigHandler); signal(SIGTERM,SigHandler);
// //
// Allocate Meter Socket // Meter Socket
// //
meter_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); meter_socket=new QUdpSocket(this);
// //
// Open Database // Open Database
@ -2171,7 +2171,7 @@ void MainObject::SendMeterOutputStatusUpdate(int card,int port,int stream)
void MainObject::SendMeterUpdate(const QString &msg,int conn_id) void MainObject::SendMeterUpdate(const QString &msg,int conn_id)
{ {
meter_socket->writeBlock(msg,msg.length(),cae_server->peerAddress(conn_id), meter_socket->writeDatagram(msg,msg.length(),cae_server->peerAddress(conn_id),
cae_server->meterPort(conn_id)); cae_server->meterPort(conn_id));
} }

4
cae/cae.h
View File

@ -29,10 +29,10 @@
#include <qobject.h> #include <qobject.h>
#include <qstring.h> #include <qstring.h>
#include <q3socketdevice.h>
#include <qsignalmapper.h> #include <qsignalmapper.h>
#include <qtimer.h> #include <qtimer.h>
#include <q3process.h> #include <q3process.h>
#include <qudpsocket.h>
#include <rdwavefile.h> #include <rdwavefile.h>
@ -172,7 +172,7 @@ class MainObject : public QObject
unsigned system_sample_rate; unsigned system_sample_rate;
CaeServer *cae_server; CaeServer *cae_server;
Q_INT16 tcp_port; Q_INT16 tcp_port;
Q3SocketDevice *meter_socket; QUdpSocket *meter_socket;
RDStation::AudioDriver cae_driver[RD_MAX_CARDS]; RDStation::AudioDriver cae_driver[RD_MAX_CARDS];
int record_owner[RD_MAX_CARDS][RD_MAX_STREAMS]; int record_owner[RD_MAX_CARDS][RD_MAX_STREAMS];
int record_length[RD_MAX_CARDS][RD_MAX_STREAMS]; int record_length[RD_MAX_CARDS][RD_MAX_STREAMS];