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

Merge branch 'deltecent-rdadmin-systemctl'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-16 20:05:50 -04:00
commit 2e8feb541d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -17795,3 +17795,6 @@
2018-10-16 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug that caused the build to break when M4A decoding
support was enabled.
2018-10-16 Patrick Linstruth <patrick@deltecent.com>
* Updated instructions in the 'Audio Resources' dialog in rdadmin(1)
to reflect the transition to Systemd.

2
rdadmin/edit_rdpanel.cpp
View File

@ -340,7 +340,7 @@ EditRDPanel::EditRDPanel(RDStation *station,RDStation *cae_station,
}
else {
QMessageBox::information(this,tr("No Audio Configuration Data"),
tr("Channel assignments will not be available for this host, as audio resource data\nhas not yet been generated. Please start the Rivendell daemons on this host\n(by executing, as user 'root', the command \"/etc/init.d/rivendell start\")\nin order to populate the audio resources database."));
tr("Channel assignments will not be available for this host, as audio resource data\nhas not yet been generated. Please start the Rivendell daemons on this host\n(by executing, as user 'root', the command \"systemctl start rivendell\")\nin order to populate the audio resources database."));
for(int i=0;i<6;i++) {
air_card_sel[i]->setDisabled(true);
}

2
rdadmin/view_adapters.cpp
View File

@ -151,7 +151,7 @@ ViewAdapters::ViewAdapters(RDStation *rdstation,QWidget *parent)
}
else {
text=tr("NO DATA AVAILABLE\n\n");
text+=tr("Please start the Rivendell daemons on this host (by executing, as user 'root', the command \"/etc/init.d/rivendell start\") in order to populate the audio resources database.");
text+=tr("Please start the Rivendell daemons on this host (by executing, as user 'root', the command \"systemctl start rivendell\") in order to populate the audio resources database.");
}
text_edit->setText(text);