mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2026-01-13 08:05:55 +01:00
2017-10-15 Fred Gleason <fredg@paravelsystems.com>
* Added a 'STATIONS.SHORT_NAME' field to the database. * Incremented the database version to 270. * Added 'RDStation::shortName()' and 'RDStation::setShortName()' methods. * Removed the 'Broadcast Security Model' control from the 'Edit Host' dialog. * Added a 'Short Name' control to the 'Edit Host' dialog. * Implemented a '%R' wildcard for Rivendell Host Short Name.
This commit is contained in:
@@ -163,7 +163,7 @@ MainWidget::MainWidget(QWidget *parent)
|
||||
if(cmd->value(j).at(k)==QChar(':')) {
|
||||
air_start_logname[i]=
|
||||
RDDateTimeDecode(cmd->value(j).left(k),air_startup_datetime,
|
||||
air_config);
|
||||
rdstation_conf,air_config);
|
||||
lineno=cmd->value(j).right(cmd->value(j).length()-(k+1));
|
||||
if(lineno.right(1)=="+") {
|
||||
air_start_start[i]=true;
|
||||
@@ -970,7 +970,7 @@ void MainWidget::ripcConnected(bool state)
|
||||
case RDAirPlayConf::StartPrevious:
|
||||
air_start_logname[i]=
|
||||
RDDateTimeDecode(rdairplay_conf->currentLog(i),
|
||||
air_startup_datetime,air_config);
|
||||
air_startup_datetime,rdstation_conf,air_config);
|
||||
if(!air_start_logname[i].isEmpty()) {
|
||||
if(rdairplay_previous_exit_code==RDAirPlayConf::ExitDirty) {
|
||||
if((air_start_line[i]=rdairplay_conf->logCurrentLine(i))>=0) {
|
||||
@@ -988,7 +988,7 @@ void MainWidget::ripcConnected(bool state)
|
||||
case RDAirPlayConf::StartSpecified:
|
||||
air_start_logname[i]=
|
||||
RDDateTimeDecode(rdairplay_conf->logName(i),
|
||||
air_startup_datetime,air_config);
|
||||
air_startup_datetime,rdstation_conf,air_config);
|
||||
if(!air_start_logname[i].isEmpty()) {
|
||||
if(rdairplay_previous_exit_code==RDAirPlayConf::ExitDirty) {
|
||||
if(air_start_logname[i]==rdairplay_conf->currentLog(i)) {
|
||||
|
||||
@@ -35,8 +35,8 @@ RLMHost::RLMHost(const QString &path,const QString &arg,
|
||||
QSocketDevice *udp_socket,QObject *parent)
|
||||
: QObject(parent)
|
||||
{
|
||||
plugin_path=RDDateDecode(path,QDate::currentDate(),air_config);
|
||||
plugin_arg=RDDateDecode(arg,QDate::currentDate(),air_config);
|
||||
plugin_path=RDDateDecode(path,QDate::currentDate(),rdstation_conf,air_config);
|
||||
plugin_arg=RDDateDecode(arg,QDate::currentDate(),rdstation_conf,air_config);
|
||||
plugin_udp_socket=udp_socket;
|
||||
plugin_handle=NULL;
|
||||
plugin_start_sym=NULL;
|
||||
@@ -86,7 +86,7 @@ void RLMHost::sendEvent(const QString &svcname,const QString &logname,
|
||||
struct rlm_pad *now=new struct rlm_pad;
|
||||
struct rlm_pad *next=new struct rlm_pad;
|
||||
memset(svc,0,sizeof(struct rlm_svc));
|
||||
RDSvc *service=new RDSvc(svcname,air_config);
|
||||
RDSvc *service=new RDSvc(svcname,rdstation_conf,air_config);
|
||||
if(!svcname.isEmpty()) {
|
||||
sprintf(svc->svc_name,"%s",(const char *)svcname.left(255));
|
||||
if(!service->programCode().isEmpty()) {
|
||||
|
||||
Reference in New Issue
Block a user