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

Merge branch 'deltecent-cae'

Browse Source
This commit is contained in:
Fred Gleason 2018-11-30 08:18:08 -05:00
commit a75981dd77
8 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -18083,3 +18083,5 @@
environmental variable. environmental variable.
2018-11-30 Patrick Linstruth <patrick@deltecent.com> 2018-11-30 Patrick Linstruth <patrick@deltecent.com>
* Put Amplitude and Time Up/Down arrows back in rdlibrary(1). * Put Amplitude and Time Up/Down arrows back in rdlibrary(1).
2018-11-26 Patrick Linstruth <patrick@deltecent.com>
* Moved mixer initialization to caed(8).

33
cae/cae.cpp
View File

@ -47,6 +47,7 @@
#include <rdcmd_switch.h> #include <rdcmd_switch.h>
#include <rdsvc.h> #include <rdsvc.h>
#include <rdsystem.h> #include <rdsystem.h>
#include <rdaudio_port.h>
#include <cae_socket.h> #include <cae_socket.h>
#include <cae.h> #include <cae.h>
@ -106,6 +107,8 @@ MainObject::MainObject(QObject *parent,const char *name)
rd_config->load(); rd_config->load();
rd_config->setModuleName("caed"); rd_config->setModuleName("caed");
rd_config->log("caed",RDConfig::LogInfo,"cae starting");
// //
// Initialize Data Structures // Initialize Data Structures
// //
@ -589,12 +592,23 @@ void MainObject::InitProvisioning() const
void MainObject::InitMixers() void MainObject::InitMixers()
{ {
for(int i=0;i<RD_MAX_CARDS;i++) { for(int i=0;i<RD_MAX_CARDS;i++) {
RDAudioPort *port=new RDAudioPort(rd_config->stationName(),i);
switch(cae_driver[i]) { switch(cae_driver[i]) {
case RDStation::Hpi: case RDStation::Hpi:
hpiSetClockSource(i,port->clockSource());
for(int j=0;j<RD_MAX_PORTS;j++) { for(int j=0;j<RD_MAX_PORTS;j++) {
for(int k=0;k<RD_MAX_PORTS;k++) { for(int k=0;k<RD_MAX_PORTS;k++) {
hpiSetPassthroughLevel(i,j,k,RD_MUTE_DEPTH); hpiSetPassthroughLevel(i,j,k,RD_MUTE_DEPTH);
} }
if(port->inputPortType(j)==RDAudioPort::Analog) {
hpiSetInputType(i,j,RDCae::Analog);
}
else {
hpiSetInputType(i,j,RDCae::AesEbu);
}
hpiSetInputLevel(i,j,RD_BASE_ANALOG+port->inputPortLevel(j));
hpiSetOutputLevel(i,j,RD_BASE_ANALOG+port->outputPortLevel(j));
hpiSetInputMode(i,j,port->inputPortMode(j));
} }
break; break;
@ -603,6 +617,15 @@ void MainObject::InitMixers()
for(int k=0;k<RD_MAX_PORTS;k++) { for(int k=0;k<RD_MAX_PORTS;k++) {
jackSetPassthroughLevel(i,j,k,RD_MUTE_DEPTH); jackSetPassthroughLevel(i,j,k,RD_MUTE_DEPTH);
} }
if(port->inputPortType(j)==RDAudioPort::Analog) {
jackSetInputType(i,j,RDCae::Analog);
}
else {
jackSetInputType(i,j,RDCae::AesEbu);
}
jackSetInputLevel(i,j,RD_BASE_ANALOG+port->inputPortLevel(j));
jackSetOutputLevel(i,j,RD_BASE_ANALOG+port->outputPortLevel(j));
jackSetInputMode(i,j,port->inputPortMode(j));
} }
break; break;
@ -611,12 +634,22 @@ void MainObject::InitMixers()
for(int k=0;k<RD_MAX_PORTS;k++) { for(int k=0;k<RD_MAX_PORTS;k++) {
alsaSetPassthroughLevel(i,j,k,RD_MUTE_DEPTH); alsaSetPassthroughLevel(i,j,k,RD_MUTE_DEPTH);
} }
if(port->inputPortType(j)==RDAudioPort::Analog) {
alsaSetInputType(i,j,RDCae::Analog);
}
else {
alsaSetInputType(i,j,RDCae::AesEbu);
}
alsaSetInputLevel(i,j,RD_BASE_ANALOG+port->inputPortLevel(j));
alsaSetOutputLevel(i,j,RD_BASE_ANALOG+port->outputPortLevel(j));
alsaSetInputMode(i,j,port->inputPortMode(j));
} }
break; break;
case RDStation::None: case RDStation::None:
break; break;
} }
delete port;
} }
} }

1
rdairplay/rdairplay.cpp
View File

@ -289,7 +289,6 @@ MainWidget::MainWidget(QWidget *parent)
// Set Audio Assignments // Set Audio Assignments
// //
air_segue_length=rda->airplayConf()->segueLength()+1; air_segue_length=rda->airplayConf()->segueLength()+1;
RDSetMixerPorts(rda->config()->stationName(),rda->cae());
// //
// RIPC Connection // RIPC Connection

5
rdcatch/rdcatch.cpp
View File

@ -233,11 +233,6 @@ MainWidget::MainWidget(QWidget *parent)
this,SLOT(playStoppedData(int))); this,SLOT(playStoppedData(int)));
rda->cae()->connectHost(); rda->cae()->connectHost();
//
// Set Audio Assignments
//
RDSetMixerPorts(rda->station()->name(),rda->cae());
// //
// Deck Monitors // Deck Monitors
// //

1
rdcatchd/rdcatchd.cpp
View File

@ -332,7 +332,6 @@ MainObject::MainObject(QObject *parent)
// //
// Sound Initialization // Sound Initialization
// //
RDSetMixerPorts(rda->config()->stationName(),rda->cae());
sql=QString("select ")+ sql=QString("select ")+
"CHANNEL,"+ // 00 "CHANNEL,"+ // 00
"CARD_NUMBER,"+ // 01 "CARD_NUMBER,"+ // 01

5
rdlibrary/rdlibrary.cpp
View File

@ -191,11 +191,6 @@ MainWidget::MainWidget(QWidget *parent)
this,SLOT(caeConnectedData(bool))); this,SLOT(caeConnectedData(bool)));
rda->cae()->connectHost(); rda->cae()->connectHost();
//
// Load Audio Assignments
//
RDSetMixerPorts(rda->config()->stationName(),rda->cae());
// //
// Filter // Filter
// //

5
rdlogedit/rdlogedit.cpp
View File

@ -147,11 +147,6 @@ MainWidget::MainWidget(QWidget *parent)
log_greenball_map=new QPixmap(greenball_xpm); log_greenball_map=new QPixmap(greenball_xpm);
log_redball_map=new QPixmap(redball_xpm); log_redball_map=new QPixmap(redball_xpm);
//
// Load Audio Assignments
//
RDSetMixerPorts(rda->config()->stationName(),rda->cae());
// //
// Log Filter // Log Filter
// //

1
rdvairplayd/rdvairplayd.cpp
View File

@ -90,7 +90,6 @@ MainObject::MainObject(QObject *parent)
// Set Audio Assignments // Set Audio Assignments
// //
// air_segue_length=rda->airplayConf()->segueLength()+1; // air_segue_length=rda->airplayConf()->segueLength()+1;
RDSetMixerPorts(rda->config()->stationName(),rda->cae());
// //
// RIPC Connection // RIPC Connection