From ad36ab606d2779c57f9889eff82759405213346c Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 15 Dec 2023 13:48:36 -0500 Subject: [PATCH] 2023-12-15 Fred Gleason * Removed vestigal support for the 'Output Stream Status' ['MS'] CAE command. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ cae/cae.cpp | 51 ---------------------------------------------- cae/cae.h | 4 ---- cae/cae_server.cpp | 13 ------------ cae/cae_server.h | 7 +++---- lib/rdcae.cpp | 16 --------------- 6 files changed, 6 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index 194ea20e..05163931 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24551,3 +24551,6 @@ 2023-12-15 Fred Gleason * Rewrote the CAE API documentation so as to use the term 'stream' more consistently. +2023-12-15 Fred Gleason + * Removed vestigal support for the 'Output Stream Status' ['MS'] + CAE command. diff --git a/cae/cae.cpp b/cae/cae.cpp index adf4e605..f361c16f 100644 --- a/cae/cae.cpp +++ b/cae/cae.cpp @@ -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 ids=cae_server->connectionIds(); - - for(unsigned i=0;imeterPort(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 ids=cae_server->connectionIds(); - - for(int l=0;lmeterPort(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) { /* diff --git a/cae/cae.h b/cae/cae.h index 4e0cb6e2..46df9937 100644 --- a/cae/cae.h +++ b/cae/cae.h @@ -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); diff --git a/cae/cae_server.cpp b/cae/cae_server.cpp index 4e74ca82..fc0ed05d 100644 --- a/cae/cae_server.cpp +++ b/cae/cae_server.cpp @@ -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&&(card2) { // So we don't warn if no cards are specified diff --git a/cae/cae_server.h b/cae/cae_server.h index 5c6c108c..25004726 100644 --- a/cae/cae_server.h +++ b/cae/cae_server.h @@ -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 &cards); private slots: diff --git a/lib/rdcae.cpp b/lib/rdcae.cpp index 03673c0c..9219b678 100644 --- a/lib/rdcae.cpp +++ b/lib/rdcae.cpp @@ -246,22 +246,6 @@ void RDCae::enableMetering(QList *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::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()));