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

2019-08-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored ripcd(8) to manage JACK port [dis]connections directly,
	rather than by delegation to caed(8).
This commit is contained in:
Fred Gleason
2019-08-06 19:54:38 -04:00
parent 102623e63b
commit 37da80e1c3
13 changed files with 188 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
ripcd/local_macros.cpp
View File

@@ -242,6 +242,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
int d;
RDMatrix::GpioType gpio_type;
QByteArray data;
int err;
rda->syslog(LOG_INFO,"received rml: \"%s\" from %s",
(const char *)rml_in->toString().toUtf8(),
@@ -399,6 +400,7 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
break;
case RDMacro::JC:
#ifdef JACK
if(rml->argQuantity()!=2) {
if(rml->echoRequested()) {
rml->acknowledge(false);
@@ -406,14 +408,45 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
}
return;
}
rda->cae()->connectJackPorts(rml->arg(0),rml->arg(1));
if(ripcd_jack_client!=NULL) {
if((err=jack_connect(ripcd_jack_client,rml->arg(1).toUtf8(),
rml->arg(0).toUtf8()))==0) {
rda->syslog(LOG_DEBUG,
"executed JACK port connection \"%s %s\"",
(const char *)rml->arg(0).toUtf8(),
(const char *)rml->arg(1).toUtf8());
}
else {
if(err!=EEXIST) {
rda->syslog(LOG_WARNING,
"JACK port connection \"%s %s\" failed, err: %d",
(const char *)rml->arg(0).toUtf8(),
(const char *)rml->arg(1).toUtf8(),
err);
}
}
}
else {
if(rml->echoRequested()) {
rml->acknowledge(false);
sendRml(rml);
}
return;
}
if(rml->echoRequested()) {
rml->acknowledge(true);
sendRml(rml);
}
#else
if(rml->echoRequested()) {
rml->acknowledge(false);
sendRml(rml);
}
#endif // JACK
break;
case RDMacro::JD:
#ifdef JACK
if(rml->argQuantity()!=2) {
if(rml->echoRequested()) {
rml->acknowledge(false);
@@ -421,11 +454,39 @@ void MainObject::RunLocalMacros(RDMacro *rml_in)
}
return;
}
rda->cae()->disconnectJackPorts(rml->arg(0),rml->arg(1));
if(ripcd_jack_client!=NULL) {
if((err=jack_disconnect(ripcd_jack_client,rml->arg(1).toUtf8(),
rml->arg(0).toUtf8()))==0) {
rda->syslog(LOG_DEBUG,
"executed JACK port disconnection \"%s %s\"",
(const char *)rml->arg(0).toUtf8(),
(const char *)rml->arg(1).toUtf8());
}
else {
rda->syslog(LOG_WARNING,
"JACK port disconnection \"%s %s\" failed, err: %d",
(const char *)rml->arg(0).toUtf8(),
(const char *)rml->arg(1).toUtf8(),
err);
}
}
else {
if(rml->echoRequested()) {
rml->acknowledge(false);
sendRml(rml);
}
return;
}
if(rml->echoRequested()) {
rml->acknowledge(true);
sendRml(rml);
}
#else
if(rml->echoRequested()) {
rml->acknowledge(false);
sendRml(rml);
}
#endif // JACK
break;
case RDMacro::LO: