Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-14 16:49:17 +02:00
Code Issues Projects Releases Wiki Activity

2018-06-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added support for filepath wildcards to the JACK client command
	lines.
This commit is contained in:
Fred Gleason 2018-06-26 13:42:08 +00:00
parent a96be157a2
commit f3296c4ceb
5 changed files with 22 additions and 12 deletions

3
ChangeLog

@ -17065,3 +17065,6 @@
2018-06-13 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rddbmgr(8) that caused incorrect version strings
to be generated when displaying current database status.
2018-06-26 Fred Gleason <fredg@paravelsystems.com>
* Added support for filepath wildcards to the JACK client command
lines.

20
cae/cae.cpp

@ -254,27 +254,29 @@ MainObject::MainObject(QObject *parent,const char *name)
//
// Start Up the Drivers
//
RDStation *station=new RDStation(rd_config->stationName());
cae_station=new RDStation(rd_config->stationName());
RDSystem *sys=new RDSystem();
system_sample_rate=sys->sampleRate();
delete sys;
hpiInit(station);
alsaInit(station);
jackInit(station);
ClearDriverEntries(station);
hpiInit(cae_station);
alsaInit(cae_station);
jackInit(cae_station);
ClearDriverEntries(cae_station);
//
// Probe Capabilities
//
ProbeCaps(station);
ProbeCaps(cae_station);
//
// Close Database Connection
//
station->setScanned(true);
delete station;
cae_station->setScanned(true);
/*
delete cae_station;
cae_station=NULL;
db->removeDatabase(rd_config->mysqlDbname());
*/
//
// Initialize Mixers
//

1
cae/cae.h

@ -172,6 +172,7 @@ class MainObject : public QObject
int owner;
} play_handle[256];
int next_play_handle;
RDStation *cae_station;
//
// HPI Driver

8
cae/cae_jack.cpp

@ -25,6 +25,7 @@
#include <qsignalmapper.h>
#include <rd.h>
#include <rddatedecode.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdringbuffer.h>
@ -433,7 +434,10 @@ void MainObject::jackClientStartData()
"STATION_NAME=\""+RDEscapeString(rd_config->stationName())+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
while(q->next()) {
QStringList fields=QStringList().split(" ",q->value(1).toString());
QString cmd=RDDateDecode(q->value(1).toString(),QDate::currentDate(),
cae_station,rd_config,
rd_config->provisioningServiceName(rd_config->stationName()));
QStringList fields=QStringList().split(" ",cmd);
jack_clients.push_back(new QProcess(fields,this));
if(jack_clients.back()->start()) {
LogLine(RDConfig::LogDebug,"started JACK Client \""+
@ -454,8 +458,6 @@ void MainObject::jackClientStartData()
void MainObject::jackInit(RDStation *station)
{
#ifdef JACK
// QString sql;
// RDSqlQuery *q;
jack_options_t jackopts=JackNullOption;
jack_status_t jackstat=JackFailure;
RDConfig::LogPriority prio=RDConfig::LogDebug;

2
docs/opsguide/rdadmin.xml

@ -2221,6 +2221,8 @@
automatically each time the Rivendell service is [re]started by
adding the appropriate command-line invocation to the
<computeroutput>JACK Clients to Start</computeroutput> list.
<link linkend="sect.filepath_wildcards.definition">Filepath
wildcards</link> can used in the command-line field.
The clients will be run under the same user as that of the
caed(8) daemon (user 'root' [UID 0] with sstock Rivendell).
Port connections between JACK clients can be managed by use