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

Merge branch 'deltecent-master'

Browse Source
This commit is contained in:
Fred Gleason 2019-08-28 17:38:31 -04:00
commit e655f8a597
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19039,3 +19039,6 @@
dialog. dialog.
2019-08-28 Patrick Linstruth <patrick@deltecent.com> 2019-08-28 Patrick Linstruth <patrick@deltecent.com>
* Added 'pypad_httpget.py' script. * Added 'pypad_httpget.py' script.
2019-08-29 Patrick Linstruth <patrick@deltecent.com>
* Modified caed(8) to skip JACK startup, rather than crash, if
no command line is specified in rdadmin(1).

24
cae/cae_jack.cpp
View File

@ -492,18 +492,24 @@ void MainObject::jackInit(RDStation *station)
if(station->startJack()) { if(station->startJack()) {
QStringList args= QStringList args=
station->jackCommandLine().split(" ",QString::SkipEmptyParts); station->jackCommandLine().split(" ",QString::SkipEmptyParts);
QString program=args.at(0); if(args.size()) {
args.removeFirst(); QString program=args.at(0);
QProcess *proc=new QProcess(this); args.removeFirst();
proc->start(program,args); QProcess *proc=new QProcess(this);
if(proc->waitForStarted()) { proc->start(program,args);
RDApplication::syslog(rd_config,LOG_INFO,"JACK server started"); if(proc->waitForStarted()) {
RDApplication::syslog(rd_config,LOG_INFO,"JACK server started");
}
else {
RDApplication::syslog(rd_config,LOG_WARNING,
"failed to start JACK server");
}
sleep(1);
} }
else { else {
RDApplication::syslog(rd_config,LOG_WARNING, RDApplication::syslog(rd_config,LOG_WARNING,
"failed to start JACK server"); "could not start JACK server: no command line specified");
} }
sleep(1);
} }
// //