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

Merge branch 'deltecent-systemctl'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-16 20:15:30 -04:00
commit 9bfc6d6a8f
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -17798,3 +17798,8 @@
2018-10-16 Patrick Linstruth <patrick@deltecent.com> 2018-10-16 Patrick Linstruth <patrick@deltecent.com>
* Updated instructions in the 'Audio Resources' dialog in rdadmin(1) * Updated instructions in the 'Audio Resources' dialog in rdadmin(1)
to reflect the transition to Systemd. to reflect the transition to Systemd.
2018-10-16 Patrick Linstruth <patrick@deltecent.com>
* Updated rdalsaconfig(8) to use the proper Systemd idiom for
restarting the 'rivendell' service.
* Updated rdselect(8) to use the proper Systemd idiom for
restarting the 'rivendell' service.

4
rdselect/rdselect.cpp
View File

@ -271,7 +271,7 @@ bool MainWidget::Shutdown(int id)
{ {
RDConfig *conf=select_configs[id]; RDConfig *conf=select_configs[id];
if(system("/etc/init.d/rivendell stop")!=0) { if(system("systemctl stop rivendell")!=0) {
return false; return false;
} }
system(QString("umount ")+conf->audioRoot()); system(QString("umount ")+conf->audioRoot());
@ -300,7 +300,7 @@ bool MainWidget::Startup(int id)
} }
unlink(RD_CONF_FILE); unlink(RD_CONF_FILE);
symlink(select_filenames[id],RD_CONF_FILE); symlink(select_filenames[id],RD_CONF_FILE);
if(system("/etc/init.d/rivendell start")!=0) { if(system("systemctl start rivendell")!=0) {
return false; return false;
} }

8
utils/rdalsaconfig/rdalsaconfig.cpp
View File

@ -46,8 +46,8 @@ bool alsa_daemon_start_needed=false;
void StopDaemons() void StopDaemons()
{ {
if(alsa_manage_daemons) { if(alsa_manage_daemons) {
if(system("/etc/init.d/rivendell status")==0) { if(system("systemctl --quiet is-active rivendell")==0) {
system("/etc/init.d/rivendell stop"); system("systemctl --quiet stop rivendell");
alsa_daemon_start_needed=true; alsa_daemon_start_needed=true;
} }
} }
@ -57,7 +57,7 @@ void StopDaemons()
void StartDaemons() void StartDaemons()
{ {
if(alsa_daemon_start_needed) { if(alsa_daemon_start_needed) {
system("/etc/init.d/rivendell start"); system("systemctl --quiet start rivendell");
} }
} }
@ -148,7 +148,7 @@ MainWidget::MainWidget(QWidget *parent)
tr("The \"--manage-daemons\" switch requires root permissions.")); tr("The \"--manage-daemons\" switch requires root permissions."));
exit(256); exit(256);
} }
if(system("/etc/init.d/rivendell status")==0) { if(system("systemctl --quiet is-active rivendell")==0) {
int r=QMessageBox::warning(this,tr("RDAlsaConfig warning"), int r=QMessageBox::warning(this,tr("RDAlsaConfig warning"),
tr("Rivendell audio will be interrupted while running this program.\nContinue?"), tr("Rivendell audio will be interrupted while running this program.\nContinue?"),
QMessageBox::Yes,QMessageBox::No); QMessageBox::Yes,QMessageBox::No);