Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-13 16:44:10 +01:00
Code Issues Projects Releases Wiki Activity

2023-12-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed vestigal support for the 'Output Stream Status' ['MS']
	CAE command.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-12-15 13:48:36 -05:00
parent dbf2a745eb
commit ad36ab606d
6 changed files with 6 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
cae/cae.cpp
View File

@@ -196,10 +196,6 @@ MainObject::MainObject(QObject *parent)
SLOT(setAudioPassthroughLevelData(int,unsigned,unsigned,unsigned,int)));
connect(cae_server,SIGNAL(setClockSourceReq(int,unsigned,int)),
this,SLOT(setClockSourceData(int,unsigned,int)));
connect(cae_server,
SIGNAL(setOutputStatusFlagReq(int,unsigned,unsigned,unsigned,bool)),
this,
SLOT(setOutputStatusFlagData(int,unsigned,unsigned,unsigned,bool)));
connect(cae_server,
SIGNAL(openRtpCaptureChannelReq(int,unsigned,unsigned,uint16_t,
unsigned,unsigned)),
@@ -1010,16 +1006,6 @@ void MainObject::setClockSourceData(int id,unsigned card,int input)
}
void MainObject::setOutputStatusFlagData(int id,unsigned card,unsigned port,
unsigned stream,bool state)
{
output_status_flag[card][port][stream]=state;
SendMeterOutputStatusUpdate(card,port,stream);
cae_server->sendCommand(id,QString::asprintf("OS %u %u %u %u +!",
card,port,stream,state));
}
void MainObject::openRtpCaptureChannelData(int id,unsigned card,unsigned port,
uint16_t udp_port,unsigned samprate,
unsigned chans)
@@ -1048,7 +1034,6 @@ void MainObject::meterEnableData(int id,uint16_t udp_port,
}
cae_server->sendCommand(id,cmd+" +!");
SendMeterOutputStatusUpdate();
}
@@ -1060,7 +1045,6 @@ void MainObject::connectionDroppedData(int id)
void MainObject::statePlayUpdate(int card,int stream,int state)
{
rda->syslog(LOG_NOTICE,"statePlayUpdate(%d,%d,%d)\n",card,stream,state);
uint64_t phandle=GetPlayHandle(card,stream);
unsigned serial=PlaySession::serialNumber(phandle);
PlaySession *psess=play_sessions.value(phandle);
@@ -1640,41 +1624,6 @@ void MainObject::SendMeterPositionUpdate(int cardnum,unsigned pos[])
}
void MainObject::SendMeterOutputStatusUpdate()
{
QList<int> ids=cae_server->connectionIds();
for(unsigned i=0;i<RD_MAX_CARDS;i++) {
if(GetDriver(i)!=NULL) {
for(unsigned j=0;j<RD_MAX_PORTS;j++) {
for(unsigned k=0;k<RD_MAX_STREAMS;k++) {
for(int l=0;l<ids.size();l++) {
if((cae_server->meterPort(ids.at(l))>0)&&
cae_server->metersEnabled(ids.at(l),i)) {
SendMeterUpdate(QString::asprintf("MS %d %d %d %d",i,j,k,
output_status_flag[i][j][k]),ids.at(l));
}
}
}
}
}
}
}
void MainObject::SendMeterOutputStatusUpdate(int card,int port,int stream)
{
QList<int> ids=cae_server->connectionIds();
for(int l=0;l<ids.size();l++) {
if((cae_server->meterPort(ids.at(l))>0)&&
cae_server->metersEnabled(ids.at(l),card)) {
SendMeterUpdate(QString::asprintf("MS %d %d %d %d",card,port,stream,
output_status_flag[card][port][stream]),ids.at(l));
}
}
}
void MainObject::SendMeterUpdate(const QString &msg,int conn_id)
{
/*