Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-16 08:34:12 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the Q3SocketDevice dependency for metering data 'RDCae'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-02-17 09:46:03 -05:00
parent 15f1636a62
commit c5c903ede7
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -21168,3 +21168,5 @@
* Removed the 'Q3CString' dependency from 'RDWaveFile'. * Removed the 'Q3CString' dependency from 'RDWaveFile'.
2021-02-15 Fred Gleason <fredg@paravelsystems.com> 2021-02-15 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3Signal' dependency from 'RDCut'. * Removed the 'Q3Signal' dependency from 'RDCut'.
2021-02-17 Fred Gleason <fredg@paravelsystems.com>
* Removed the Q3SocketDevice dependency for metering data 'RDCae'.

31
lib/rdcae.cpp
View File

@ -2,7 +2,7 @@
// //
// Connection to the Rivendell Core Audio Engine // Connection to the Rivendell Core Audio Engine
// //
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -18,23 +18,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// //
#include <unistd.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <syslog.h> #include <syslog.h>
#include <qobject.h> #include "rdapplication.h"
#include <ctype.h> #include "rdcae.h"
#include "rddb.h"
#include <q3socketdevice.h> #include "rddebug.h"
#include <qtimer.h> #include "rdescape_string.h"
#include <qstringlist.h>
#include <rdapplication.h>
#include <rddb.h>
#include <rdcae.h>
#include <rddebug.h>
#include <rdescape_string.h>
RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent) RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent)
: QObject(parent) : QObject(parent)
@ -54,10 +48,9 @@ RDCae::RDCae(RDStation *station,RDConfig *config,QObject *parent)
// //
// Meter Connection // Meter Connection
// //
cae_meter_socket=new Q3SocketDevice(Q3SocketDevice::Datagram); cae_meter_socket=new QUdpSocket(this);
cae_meter_socket->setBlocking(false);
for(Q_INT16 i=30000;i<30100;i++) { for(Q_INT16 i=30000;i<30100;i++) {
if(cae_meter_socket->bind(QHostAddress(),i)) { if(cae_meter_socket->bind(i)) {
i=31000; i=31000;
} }
} }
@ -125,7 +118,7 @@ void RDCae::connectHost()
void RDCae::enableMetering(QList<int> *cards) void RDCae::enableMetering(QList<int> *cards)
{ {
QString cmd=QString().sprintf("ME %u",cae_meter_socket->port()); QString cmd=QString().sprintf("ME %u",cae_meter_socket->localPort());
for(int i=0;i<cards->size();i++) { for(int i=0;i<cards->size();i++) {
if(cards->at(i)>=0) { if(cards->at(i)>=0) {
bool found=false; bool found=false;
@ -642,7 +635,7 @@ void RDCae::UpdateMeters()
int n; int n;
QStringList args; QStringList args;
while((n=cae_meter_socket->readBlock(msg,1500))>0) { while((n=cae_meter_socket->readDatagram(msg,1500))>0) {
msg[n]=0; msg[n]=0;
args=QString(msg).split(" "); args=QString(msg).split(" ");
if(args[0]=="ML") { if(args[0]=="ML") {

10
lib/rdcae.h
View File

@ -2,7 +2,7 @@
// //
// Connection to the Rivendell Core Audio Engine // Connection to the Rivendell Core Audio Engine
// //
// (C) Copyright 2002-2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -23,9 +23,9 @@
#include <q3socketdevice.h> #include <q3socketdevice.h>
#include <qlabel.h> #include <QList>
#include <qobject.h> #include <QObject>
#include <qlist.h> #include <QUdpSocket>
#include <rd.h> #include <rd.h>
#include <rdcmd_cache.h> #include <rdcmd_cache.h>
@ -112,7 +112,7 @@ class RDCae : public QObject
bool input_status[RD_MAX_CARDS][RD_MAX_PORTS]; bool input_status[RD_MAX_CARDS][RD_MAX_PORTS];
int cae_handle[RD_MAX_CARDS][RD_MAX_STREAMS]; int cae_handle[RD_MAX_CARDS][RD_MAX_STREAMS];
unsigned cae_pos[RD_MAX_CARDS][RD_MAX_STREAMS]; unsigned cae_pos[RD_MAX_CARDS][RD_MAX_STREAMS];
Q3SocketDevice *cae_meter_socket; QUdpSocket *cae_meter_socket;
short cae_input_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; short cae_input_levels[RD_MAX_CARDS][RD_MAX_PORTS][2];
short cae_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; short cae_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2];
short cae_stream_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2]; short cae_stream_output_levels[RD_MAX_CARDS][RD_MAX_PORTS][2];