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

2023-08-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed support for the 'Set Input Volume' ['IV'] CAE command.
	* Removed support for the 'Set Input Level' ['IL'] CAE command.
	* Removed support for the 'Set Output Level' ['OL'] CAE command.
	* Removed support for the 'Set Input Mode' ['IM'] CAE command.
	* Removed support for the 'Set Output Mode' ['OM'] CAE command.
	* Removed support for the 'Set Input Vox Level' ['IX'] CAE command.
	* Removed support for the 'Set Input Type' ['IT'] CAE command.
	* Removed support for the 'Set Clock Source' ['CS'] CAE command.
	* Removed the 'RDCae::setClockSource()' method.
	* Removed the 'RDCae::setInputVolume()' method.
	* Removed the 'RDCae::setInputLevel()' method.
	* Removed the 'RDCae::setOutputLevel()' method.
	* Removed the 'RDCae::setInputMode()' method.
	* Removed the 'RDCae::setOutputMode()' method.
	* Removed the 'RDCae::setInputVOXLevel()' method.
	* Removed the 'RDCae::setInputType()' method.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-08-29 17:39:19 -04:00
parent 2723339e73
commit ac45e60949
8 changed files with 66 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cae/cae.cpp
View File

@@ -207,6 +207,8 @@ MainObject::MainObject(QObject *parent)
SIGNAL(setAudioPassthroughLevelReq(int,unsigned,unsigned,unsigned,int)),
this,
SLOT(setAudioPassthroughLevelData(int,unsigned,unsigned,unsigned,int)));
connect(cae_server,SIGNAL(updateAudioPorts(int)),
this,SLOT(updateAudioPortsData(int)));
connect(cae_server,SIGNAL(setClockSourceReq(int,unsigned,int)),
this,SLOT(setClockSourceData(int,unsigned,int)));
connect(cae_server,
@@ -969,6 +971,31 @@ void MainObject::setAudioPassthroughLevelData(int id,unsigned card,
}
void MainObject::updateAudioPortsData(int id)
{
for(int i=0;i<RD_MAX_CARDS;i++) {
RDAudioPort *port=new RDAudioPort(rda->config()->stationName(),i);
Driver *dvr=GetDriver(i);
if(dvr!=NULL) {
dvr->setClockSource(i,port->clockSource());
for(int j=0;j<RD_MAX_PORTS;j++) {
if(port->inputPortType(j)==RDAudioPort::Analog) {
dvr->setInputType(i,j,RDCae::Analog);
}
else {
dvr->setInputType(i,j,RDCae::AesEbu);
}
dvr->setInputLevel(i,j,RD_BASE_ANALOG+port->inputPortLevel(j));
dvr->setOutputLevel(i,j,RD_BASE_ANALOG+port->outputPortLevel(j));
dvr->setInputMode(i,j,port->inputPortMode(j));
}
}
delete port;
}
}
void MainObject::setClockSourceData(int id,unsigned card,int input)
{
if((card<0)||(input<0)) {
@@ -1229,28 +1256,17 @@ void MainObject::InitProvisioning() const
void MainObject::InitMixers()
{
for(int i=0;i<RD_MAX_CARDS;i++) {
RDAudioPort *port=new RDAudioPort(rda->config()->stationName(),i);
Driver *dvr=GetDriver(i);
Driver *dvr=NULL;
updateAudioPortsData(-1);
for(int i=0;i<RD_MAX_CARDS;i++) {
if(dvr!=NULL) {
dvr->setClockSource(i,port->clockSource());
for(int j=0;j<RD_MAX_PORTS;j++) {
for(int k=0;k<RD_MAX_PORTS;k++) {
dvr->setPassthroughLevel(i,j,k,RD_MUTE_DEPTH);
}
if(port->inputPortType(j)==RDAudioPort::Analog) {
dvr->setInputType(i,j,RDCae::Analog);
}
else {
dvr->setInputType(i,j,RDCae::AesEbu);
}
dvr->setInputLevel(i,j,RD_BASE_ANALOG+port->inputPortLevel(j));
dvr->setOutputLevel(i,j,RD_BASE_ANALOG+port->outputPortLevel(j));
dvr->setInputMode(i,j,port->inputPortMode(j));
}
}
delete port;
}
}