Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-07 07:32:34 +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).

6
cae/cae_jack.cpp
View File

@ -492,6 +492,7 @@ 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);
if(args.size()) {
QString program=args.at(0); QString program=args.at(0);
args.removeFirst(); args.removeFirst();
QProcess *proc=new QProcess(this); QProcess *proc=new QProcess(this);
@ -505,6 +506,11 @@ void MainObject::jackInit(RDStation *station)
} }
sleep(1); sleep(1);
} }
else {
RDApplication::syslog(rd_config,LOG_WARNING,
"could not start JACK server: no command line specified");
}
}
// //
// Attempt to Connect to Jack Server // Attempt to Connect to Jack Server