2022-12-24 Fred Gleason <fredg@paravelsystems.com>

* Added a 'ServiceStartDelay=' directive to the '[Tuning]' section
	of rd.conf(5).
	* Added 'sound.target' to the 'After=' directive in
	'systemd/rivendell.service.in'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-12-24 11:15:48 -05:00
parent eb3cf2f127
commit b59e3b8479
8 changed files with 64 additions and 4 deletions

View File

@@ -626,6 +626,11 @@
*/
#define RD_DEFAULT_SERVICE_TIMEOUT 30
/*
* Default 'ServiceStartupDelay=' value in rd.conf(5) [seconds]
*/
#define RD_DEFAULT_SERVICE_STARTUP_DELAY 5
/*
* File Extension for RSS XML Feed Files
*/

View File

@@ -519,6 +519,13 @@ QString RDConfig::tempDirectory()
return conf_temp_directory;
}
int RDConfig::serviceStartupDelay() const
{
return conf_service_startup_delay;
}
QString RDConfig::sasStation() const
{
return conf_sas_station;
@@ -706,6 +713,8 @@ bool RDConfig::load()
conf_service_timeout=
profile->intValue("Tuning","ServiceTimeout",RD_DEFAULT_SERVICE_TIMEOUT);
conf_temp_directory=profile->stringValue("Tuning","TempDirectory","");
conf_service_startup_delay=profile->intValue("Tuning","ServiceStartupDelay",
RD_DEFAULT_SERVICE_STARTUP_DELAY);
conf_sas_station=profile->stringValue("SASFilter","Station","");
conf_sas_matrix=profile->intValue("SASFilter","Matrix",0);
conf_sas_base_cart=profile->intValue("SASFilter","BaseCart",0);
@@ -820,6 +829,7 @@ void RDConfig::clear()
conf_transcoding_delay=0;
conf_service_timeout=RD_DEFAULT_SERVICE_TIMEOUT;
conf_temp_directory="";
conf_service_startup_delay=RD_DEFAULT_SERVICE_STARTUP_DELAY;
conf_sas_station="";
conf_sas_matrix=-1;
conf_sas_base_cart=1;

View File

@@ -25,8 +25,8 @@
#include <vector>
#include <qhostaddress.h>
#include <qstring.h>
#include <QHostAddress>
#include <QString>
#include <rd.h>
@@ -123,6 +123,7 @@ class RDConfig
int transcodingDelay() const;
int serviceTimeout() const;
QString tempDirectory();
int serviceStartupDelay() const;
QString sasStation() const;
int sasMatrix() const;
unsigned sasBaseCart() const;
@@ -208,6 +209,7 @@ class RDConfig
int conf_realtime_priority;
int conf_service_timeout;
QString conf_temp_directory;
int conf_service_startup_delay;
QString conf_sas_station;
int conf_sas_matrix;
unsigned conf_sas_base_cart;