Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-19 22:48:01 +02: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24551,3 +24551,6 @@
2023-12-15 Fred Gleason <fredg@paravelsystems.com>
* Rewrote the CAE API documentation so as to use the term 'stream'
more consistently.
2023-12-15 Fred Gleason <fredg@paravelsystems.com>
* Removed vestigal support for the 'Output Stream Status' ['MS']
CAE command.

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)
{
/*

4
cae/cae.h
View File

@ -99,8 +99,6 @@ class MainObject : public QObject
void setAudioPassthroughLevelData(int id,unsigned card,unsigned input,
unsigned output,int level);
void setClockSourceData(int id,unsigned card,int input);
void setOutputStatusFlagData(int id,unsigned card,unsigned port,
unsigned stream,bool state);
void openRtpCaptureChannelData(int id,unsigned card,unsigned port,
uint16_t udp_port,unsigned samprate,
unsigned chans);
@ -124,8 +122,6 @@ class MainObject : public QObject
short levels[]);
void SendStreamMeterLevelUpdate(PlaySession *psess,short levels[]);
void SendMeterPositionUpdate(int cardnum,unsigned pos[]);
void SendMeterOutputStatusUpdate();
void SendMeterOutputStatusUpdate(int card,int port,int stream);
void SendMeterUpdate(const QString &msg,int conn_id);
Driver *GetDriver(unsigned card) const;
void MakeDriver(unsigned *next_card,RDStation::AudioDriver type);

13
cae/cae_server.cpp
View File

@ -567,19 +567,6 @@ bool CaeServer::ProcessCommand(int id,const QString &cmd)
}
}
}
if((f0.at(0)=="OS")&&(f0.size()==5)) { // Set Output Status Flag
unsigned card=f0.at(1).toUInt(&ok);
if(ok&&(card<RD_MAX_CARDS)) {
unsigned port=f0.at(2).toUInt(&ok);
if(ok&&(port<RD_MAX_PORTS)) {
unsigned stream=f0.at(3).toUInt(&ok);
if(ok&&(stream<RD_MAX_STREAMS)) {
emit setOutputStatusFlagReq(id,card,port,stream,f0.at(4)=="1");
was_processed=true;
}
}
}
}
if(f0.at(0)=="ME") { // Meter Enable
if(f0.size()>2) { // So we don't warn if no cards are specified

7
cae/cae_server.h
View File

@ -97,10 +97,9 @@ class CaeServer : public QObject
void setAudioPassthroughLevelReq(int id,unsigned card,unsigned input,
unsigned output,int level);
void setClockSourceReq(int id,unsigned card,int input);
void setOutputStatusFlagReq(int id,unsigned card,unsigned port,
unsigned stream,bool state);
void openRtpCaptureChannelReq(int id,unsigned card,unsigned port,uint16_t udp_port,
unsigned samprate,unsigned chans);
void openRtpCaptureChannelReq(int id,unsigned card,unsigned port,
uint16_t udp_port,unsigned samprate,
unsigned chans);
void meterEnableReq(int id,uint16_t udp_port,const QList<unsigned> &cards);
private slots:

16
lib/rdcae.cpp
View File

@ -246,22 +246,6 @@ void RDCae::enableMetering(QList<int> *cards)
unsigned RDCae::loadPlay(unsigned card,unsigned port,const QString &name)
{
/*
cae_serials[card][port]=next_serial_number++;
SendCommand(QString().sprintf("LP %u %u %u %s!",
cae_serials[card][port],card,port,
name.toUtf8().constData()));
__RDCae_PlayChannel chan(card,port);
for(QMap<unsigned,__RDCae_PlayChannel>::const_iterator it=cae_play_channels.begin();it!=cae_play_channels.end();it++) {
if(it.value()==chan) {
emit playPortStatusChanged(card,port,true);
break;
}
}
cae_play_channelscae_serials
return cae_serials[card][port];
*/
unsigned serial=next_serial_number++;
SendCommand(QString().sprintf("LP %u %u %u %s!",
serial,card,port,name.toUtf8().constData()));