From e07cabc72f19f328caea96e2a0a9ff134c6e71c6 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 16 Dec 2017 16:45:51 -0500 Subject: [PATCH] 2017-12-16 Fred Gleason * Added support for filepath wildcards in macro carts. --- ChangeLog | 2 ++ docs/opsguide/rdlibrary.xml | 6 ++++++ importers/nexgen_filter.cpp | 12 ++++++------ importers/sas_filter.cpp | 12 ++++++------ importers/wings_filter.cpp | 12 ++++++------ lib/rddatedecode.cpp | 1 + lib/rdmacro_event.cpp | 9 ++++----- lib/rdripc.cpp | 23 +++++++++++------------ lib/rdripc.h | 9 +++++++-- rdadmin/rdadmin.cpp | 4 ++-- rdairplay/rdairplay.cpp | 2 +- rdcartslots/rdcartslots.cpp | 2 +- rdcastmanager/rdcastmanager.cpp | 14 +++++++------- rdcatch/rdcatch.cpp | 2 +- rdcatchd/rdcatchd.cpp | 12 ++++++------ rdlibrary/rdlibrary.cpp | 2 +- rdlogedit/rdlogedit.cpp | 2 +- rdlogin/rdlogin.cpp | 12 ++++++------ rdlogmanager/rdlogmanager.cpp | 2 +- rdpanel/rdpanel.cpp | 2 +- utils/rdclilogedit/rdclilogedit.cpp | 2 +- utils/rddelete/rddelete.cpp | 2 +- utils/rddgimport/rddgimport.cpp | 2 +- utils/rddiscimport/rddiscimport.cpp | 2 +- utils/rdexport/rdexport.cpp | 16 ++++++++-------- utils/rdgpimon/rdgpimon.cpp | 12 ++++++------ utils/rdimport/rdimport.cpp | 16 ++++++++-------- utils/rdmarkerset/rdmarkerset.cpp | 2 +- utils/rdrender/rdrender.cpp | 12 ++++++------ utils/sas_shim/sas_shim.cpp | 12 ++++++------ 30 files changed, 116 insertions(+), 104 deletions(-) diff --git a/ChangeLog b/ChangeLog index f80119be..6645bfd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16493,3 +16493,5 @@ 2017-12-15 Fred Gleason * Updated 'NEWS'. * Incremented the package version to 2.17.0int07. +2017-12-16 Fred Gleason + * Added support for filepath wildcards in macro carts. diff --git a/docs/opsguide/rdlibrary.xml b/docs/opsguide/rdlibrary.xml index 5da30418..8cf91929 100644 --- a/docs/opsguide/rdlibrary.xml +++ b/docs/opsguide/rdlibrary.xml @@ -697,6 +697,12 @@ Paste individual lines both within a given cart or between carts. + + In addition to RML code, lines can also contain host variables + (see ) + and filepath wildcards + (see ). + diff --git a/importers/nexgen_filter.cpp b/importers/nexgen_filter.cpp index dccc044b..f8c3ed7c 100644 --- a/importers/nexgen_filter.cpp +++ b/importers/nexgen_filter.cpp @@ -154,17 +154,17 @@ MainObject::MainObject(QObject *parent) exit(1); } - // - // RIPCD Connection - // - filter_ripc=new RDRipc(""); - filter_ripc->connectHost("localhost",RIPCD_TCP_PORT,rdconfig->password()); - // // Station Configuration // filter_rdstation=new RDStation(rdconfig->stationName()); + // + // RIPCD Connection + // + filter_ripc=new RDRipc(filter_rdstation,rdconfig,this); + filter_ripc->connectHost("localhost",RIPCD_TCP_PORT,rdconfig->password()); + // // Validate Arguments // diff --git a/importers/sas_filter.cpp b/importers/sas_filter.cpp index b35c644a..f009b634 100644 --- a/importers/sas_filter.cpp +++ b/importers/sas_filter.cpp @@ -80,17 +80,17 @@ MainObject::MainObject(QObject *parent) exit(256); } - // - // RIPCD Connection - // - filter_ripc=new RDRipc(""); - filter_ripc->connectHost("localhost",RIPCD_TCP_PORT,rd_config->password()); - // // Station Configuration // filter_rdstation=new RDStation(rd_config->stationName()); + // + // RIPCD Connection + // + filter_ripc=new RDRipc(filter_rdstation,rd_config,this); + filter_ripc->connectHost("localhost",RIPCD_TCP_PORT,rd_config->password()); + // // RDCatchd Connection // diff --git a/importers/wings_filter.cpp b/importers/wings_filter.cpp index 36ec8f5f..cee85e68 100644 --- a/importers/wings_filter.cpp +++ b/importers/wings_filter.cpp @@ -84,17 +84,17 @@ MainObject::MainObject(QObject *parent) exit(1); } - // - // RIPCD Connection - // - filter_ripc=new RDRipc(""); - filter_ripc->connectHost("localhost",RIPCD_TCP_PORT,rdconfig->password()); - // // Station Configuration // filter_rdstation=new RDStation(rdconfig->stationName()); + // + // RIPCD Connection + // + filter_ripc=new RDRipc(filter_rdstation,rdconfig,this); + filter_ripc->connectHost("localhost",RIPCD_TCP_PORT,rdconfig->password()); + // // Read Arguments // diff --git a/lib/rddatedecode.cpp b/lib/rddatedecode.cpp index 9015bf51..f7cb38a4 100644 --- a/lib/rddatedecode.cpp +++ b/lib/rddatedecode.cpp @@ -365,5 +365,6 @@ QString RDDateTimeDecode(QString str,const QDateTime &datetime, string+=field; } } + return string; } diff --git a/lib/rdmacro_event.cpp b/lib/rdmacro_event.cpp index 17e942b0..9ac0cac8 100644 --- a/lib/rdmacro_event.cpp +++ b/lib/rdmacro_event.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -250,11 +251,9 @@ void RDMacroEvent::exec(int line) rml.setAddress(addr); } else { - sql= - QString().sprintf("select VARVALUE from HOSTVARS \ - where (STATION_NAME=\"%s\")&&(NAME=\"%s\")", - (const char *)event_ripc->station(), - (const char *)stationname); + sql=QString("select VARVALUE from HOSTVARS where ")+ + "(STATION_NAME=\""+RDEscapeString(event_ripc->station())+"\")&&"+ + "(NAME=\""+RDEscapeString(stationname)+"\")"; q=new RDSqlQuery(sql); if(q->first()) { stationname=q->value(0).toString(); diff --git a/lib/rdripc.cpp b/lib/rdripc.cpp index acab3e6f..073108aa 100644 --- a/lib/rdripc.cpp +++ b/lib/rdripc.cpp @@ -2,7 +2,7 @@ // // Connection to the Rivendell Interprocess Communication Daemon // -// (C) Copyright 2002-2003,2016 Fred Gleason +// (C) Copyright 2002-2003,2016-2017 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -22,14 +22,18 @@ #include #include +#include +#include #include #include -RDRipc::RDRipc(QString stationname,QObject *parent) +//RDRipc::RDRipc(QString stationname,QObject *parent) +RDRipc::RDRipc(RDStation *station,RDConfig *config,QObject *parent) : QObject(parent) { - ripc_stationname=stationname; + ripc_station=station; + ripc_config=config; ripc_onair_flag=false; ripc_ignore_mask=false; debug=false; @@ -62,7 +66,7 @@ QString RDRipc::user() const QString RDRipc::station() const { - return ripc_stationname; + return ripc_station->name(); } @@ -143,14 +147,8 @@ void RDRipc::sendRml(RDMacro *macro) { char buffer[RD_RML_MAX_LENGTH]; char cmd[RD_RML_MAX_LENGTH+4]; - /* - int echo=0; - - if(macro->echoRequested()) { - echo=1; - } - */ Q_UINT16 port=RD_RML_NOECHO_PORT; + QDateTime now=QDateTime::currentDateTime(); if(macro->echoRequested()) { port=RD_RML_ECHO_PORT; @@ -162,12 +160,13 @@ void RDRipc::sendRml(RDMacro *macro) QString rmlline(buffer); QString sql=QString().sprintf("select NAME,VARVALUE from HOSTVARS \ where STATION_NAME=\"%s\"", - (const char *)ripc_stationname); + (const char *)ripc_station->name()); RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) { rmlline.replace(q->value(0).toString(),q->value(1).toString()); } delete q; + rmlline=RDDateTimeDecode(rmlline,now,ripc_station,ripc_config); switch(macro->role()) { case RDMacro::Cmd: sprintf(cmd,"MS %s %d %s",(const char *)macro->address().toString(), diff --git a/lib/rdripc.h b/lib/rdripc.h index 3dc3e154..6d7de806 100644 --- a/lib/rdripc.h +++ b/lib/rdripc.h @@ -25,7 +25,9 @@ #include #include +#include #include +#include #ifndef RDRIPC_H #define RDRIPC_H @@ -38,7 +40,8 @@ class RDRipc : public QObject { Q_OBJECT public: - RDRipc(QString stationname,QObject *parent=0); + // RDRipc(QString stationname,QObject *parent=0); + RDRipc(RDStation *station,RDConfig *config,QObject *parent=0); ~RDRipc(); QString user() const; QString station() const; @@ -79,7 +82,9 @@ class RDRipc : public QObject QSocket *ripc_socket; QString ripc_user; QString ripc_password; - QString ripc_stationname; + // QString ripc_stationname; + RDStation *ripc_station; + RDConfig *ripc_config; bool ripc_onair_flag; bool ripc_ignore_mask; bool debug; diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp index 3044974e..8bb012ea 100644 --- a/rdadmin/rdadmin.cpp +++ b/rdadmin/rdadmin.cpp @@ -178,10 +178,10 @@ MainWidget::MainWidget(QWidget *parent) char temp[256]; GetPrivateProfileString(RD_CONF_FILE,"Identity","Password", temp,"",255); - rdripc=new RDRipc(admin_config->stationName(),this); - rdripc->connectHost("localhost",RIPCD_TCP_PORT,temp); admin_station=new RDStation(admin_config->stationName(),this); admin_system=new RDSystem(); + rdripc=new RDRipc(admin_station,admin_config,this); + rdripc->connectHost("localhost",RIPCD_TCP_PORT,temp); // // Log In diff --git a/rdairplay/rdairplay.cpp b/rdairplay/rdairplay.cpp index a97a47c7..6db40609 100644 --- a/rdairplay/rdairplay.cpp +++ b/rdairplay/rdairplay.cpp @@ -342,7 +342,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - rdripc=new RDRipc(air_config->stationName()); + rdripc=new RDRipc(rdstation_conf,air_config,this); connect(rdripc,SIGNAL(connected(bool)),this,SLOT(ripcConnected(bool))); connect(rdripc,SIGNAL(userChanged()),this,SLOT(userData())); connect(rdripc,SIGNAL(rmlReceived(RDMacro *)), diff --git a/rdcartslots/rdcartslots.cpp b/rdcartslots/rdcartslots.cpp index 1e6b519f..29a9c680 100644 --- a/rdcartslots/rdcartslots.cpp +++ b/rdcartslots/rdcartslots.cpp @@ -123,7 +123,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - panel_ripc=new RDRipc(panel_config->stationName()); + panel_ripc=new RDRipc(panel_station,panel_config,this); connect(panel_ripc,SIGNAL(userChanged()),this,SLOT(userData())); connect(panel_ripc,SIGNAL(rmlReceived(RDMacro *)), this,SLOT(rmlReceivedData(RDMacro *))); diff --git a/rdcastmanager/rdcastmanager.cpp b/rdcastmanager/rdcastmanager.cpp index df21163d..1debfd03 100644 --- a/rdcastmanager/rdcastmanager.cpp +++ b/rdcastmanager/rdcastmanager.cpp @@ -122,23 +122,23 @@ MainWidget::MainWidget(QWidget *parent) exit(256); } + // + // Station Configuration + // + rdstation_conf=new RDStation(config->stationName(),this); + cast_system=new RDSystem(); + // // RIPC Connection // #ifndef WIN32 - cast_ripc=new RDRipc(config->stationName()); + cast_ripc=new RDRipc(rdstation_conf,config,this); connect(cast_ripc,SIGNAL(userChanged()),this,SLOT(userChangedData())); cast_ripc->connectHost("localhost",RIPCD_TCP_PORT,config->password()); #else cast_ripc=NULL; #endif // WIN32 - // - // Station Configuration - // - rdstation_conf=new RDStation(config->stationName(),this); - cast_system=new RDSystem(); - // // User // diff --git a/rdcatch/rdcatch.cpp b/rdcatch/rdcatch.cpp index ea2c81d0..e0c38c83 100644 --- a/rdcatch/rdcatch.cpp +++ b/rdcatch/rdcatch.cpp @@ -250,7 +250,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - catch_ripc=new RDRipc(catch_config->stationName()); + catch_ripc=new RDRipc(rdstation_conf,catch_config,this); connect(catch_ripc,SIGNAL(connected(bool)), this,SLOT(ripcConnectedData(bool))); catch_user=NULL; diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index ef782f52..bdfa8391 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -255,10 +255,15 @@ MainObject::MainObject(QObject *parent) catch_xload_timer=new QTimer(this); connect(catch_xload_timer,SIGNAL(timeout()),this,SLOT(updateXloadsData())); + // + // Station Configuration + // + catch_rdstation=new RDStation(catch_config->stationName()); + // // RIPCD Connection // - catch_ripc=new RDRipc(catch_config->stationName()); + catch_ripc=new RDRipc(catch_rdstation,catch_config,this); catch_ripc->connectHost("localhost",RIPCD_TCP_PORT,catch_config->password()); connect(catch_ripc,SIGNAL(rmlReceived(RDMacro *)), this,SLOT(rmlReceivedData(RDMacro *))); @@ -270,11 +275,6 @@ MainObject::MainObject(QObject *parent) // catch_system=new RDSystem(); - // - // Station Configuration - // - catch_rdstation=new RDStation(catch_config->stationName()); - // // CAE Connection // diff --git a/rdlibrary/rdlibrary.cpp b/rdlibrary/rdlibrary.cpp index 5b6f8a47..7720a796 100644 --- a/rdlibrary/rdlibrary.cpp +++ b/rdlibrary/rdlibrary.cpp @@ -211,7 +211,7 @@ MainWidget::MainWidget(QWidget *parent) lib_filter_mode=rdstation_conf->filterMode(); rdaudioport_conf=new RDAudioPort(lib_config->stationName(), rdlibrary_conf->inputCard()); - rdripc=new RDRipc(lib_config->stationName()); + rdripc=new RDRipc(rdstation_conf,lib_config,this); connect(rdripc,SIGNAL(connected(bool)),this,SLOT(connectedData(bool))); connect(rdripc,SIGNAL(userChanged()),this,SLOT(userData())); rdripc->connectHost("localhost",RIPCD_TCP_PORT,lib_config->password()); diff --git a/rdlogedit/rdlogedit.cpp b/rdlogedit/rdlogedit.cpp index 42854dba..0c80523f 100644 --- a/rdlogedit/rdlogedit.cpp +++ b/rdlogedit/rdlogedit.cpp @@ -187,7 +187,7 @@ MainWidget::MainWidget(QWidget *parent) // RIPC Connection // #ifndef WIN32 - rdripc=new RDRipc(log_config->stationName()); + rdripc=new RDRipc(rdstation_conf,log_config,this); connect(rdripc,SIGNAL(connected(bool)),this,SLOT(connectedData(bool))); connect(rdripc,SIGNAL(userChanged()),this,SLOT(userData())); rdripc->connectHost("localhost",RIPCD_TCP_PORT,log_config->password()); diff --git a/rdlogin/rdlogin.cpp b/rdlogin/rdlogin.cpp index f9a5b9f2..87f52c02 100644 --- a/rdlogin/rdlogin.cpp +++ b/rdlogin/rdlogin.cpp @@ -127,20 +127,20 @@ MainWidget::MainWidget(QWidget *parent) exit(256); } + // + // Station + // + login_station=new RDStation(login_config->stationName()); + // // RIPC Connection // - login_ripc=new RDRipc(login_config->stationName()); + login_ripc=new RDRipc(login_station,login_config,this); connect(login_ripc,SIGNAL(connected(bool)),this,SLOT(connectedData(bool))); connect(login_ripc,SIGNAL(userChanged()),this,SLOT(userData())); login_ripc->connectHost("localhost",RIPCD_TCP_PORT, login_config->password()); - // - // Station - // - login_station=new RDStation(login_config->stationName()); - // // System // diff --git a/rdlogmanager/rdlogmanager.cpp b/rdlogmanager/rdlogmanager.cpp index 194b0aaf..4aa1a030 100644 --- a/rdlogmanager/rdlogmanager.cpp +++ b/rdlogmanager/rdlogmanager.cpp @@ -164,7 +164,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - rdripc=new RDRipc(log_config->stationName()); + rdripc=new RDRipc(rdstation_conf,log_config,this); connect(rdripc,SIGNAL(userChanged()),this,SLOT(userData())); rdripc->connectHost("localhost",RIPCD_TCP_PORT,log_config->password()); diff --git a/rdpanel/rdpanel.cpp b/rdpanel/rdpanel.cpp index 8e01cf24..9ffe1203 100644 --- a/rdpanel/rdpanel.cpp +++ b/rdpanel/rdpanel.cpp @@ -172,7 +172,7 @@ MainWidget::MainWidget(QWidget *parent) // // RIPC Connection // - rdripc=new RDRipc(panel_config->stationName()); + rdripc=new RDRipc(rdstation_conf,panel_config,this); connect(rdripc,SIGNAL(userChanged()),this,SLOT(userData())); connect(rdripc,SIGNAL(rmlReceived(RDMacro *)), this,SLOT(rmlReceivedData(RDMacro *))); diff --git a/utils/rdclilogedit/rdclilogedit.cpp b/utils/rdclilogedit/rdclilogedit.cpp index 65b7db91..63eb0ee8 100644 --- a/utils/rdclilogedit/rdclilogedit.cpp +++ b/utils/rdclilogedit/rdclilogedit.cpp @@ -93,7 +93,7 @@ MainObject::MainObject(QObject *parent) // RIPC Connection // edit_user=NULL; - edit_ripc=new RDRipc(edit_config->stationName()); + edit_ripc=new RDRipc(edit_station,edit_config,this); connect(edit_ripc,SIGNAL(userChanged()),this,SLOT(userData())); edit_ripc->connectHost("localhost",RIPCD_TCP_PORT,edit_config->password()); } diff --git a/utils/rddelete/rddelete.cpp b/utils/rddelete/rddelete.cpp index d33b938a..61ec4b1f 100644 --- a/utils/rddelete/rddelete.cpp +++ b/utils/rddelete/rddelete.cpp @@ -135,7 +135,7 @@ MainObject::MainObject(QObject *parent) // // RIPC Connection // - del_ripc=new RDRipc(del_config->stationName()); + del_ripc=new RDRipc(del_station,del_config,this); connect(del_ripc,SIGNAL(userChanged()),this,SLOT(userData())); del_ripc->connectHost("localhost",RIPCD_TCP_PORT,del_config->password()); diff --git a/utils/rddgimport/rddgimport.cpp b/utils/rddgimport/rddgimport.cpp index 2e34d27e..b5724d90 100644 --- a/utils/rddgimport/rddgimport.cpp +++ b/utils/rddgimport/rddgimport.cpp @@ -107,7 +107,7 @@ MainWidget::MainWidget(QWidget *parent) // dg_station=new RDStation(dg_config->stationName(),this); dg_library_conf=new RDLibraryConf(dg_config->stationName(),0); - dg_ripc=new RDRipc(dg_config->stationName(),this); + dg_ripc=new RDRipc(dg_station,dg_config,this); connect(dg_ripc,SIGNAL(userChanged()),this,SLOT(userChangedData())); dg_ripc->connectHost("localhost",RIPCD_TCP_PORT,dg_config->password()); diff --git a/utils/rddiscimport/rddiscimport.cpp b/utils/rddiscimport/rddiscimport.cpp index 143da728..6ec4e740 100644 --- a/utils/rddiscimport/rddiscimport.cpp +++ b/utils/rddiscimport/rddiscimport.cpp @@ -117,7 +117,7 @@ MainWidget::MainWidget(QWidget *parent) dg_system=new RDSystem(); dg_station=new RDStation(dg_config->stationName(),this); dg_library_conf=new RDLibraryConf(dg_config->stationName(),0); - dg_ripc=new RDRipc(dg_config->stationName(),this); + dg_ripc=new RDRipc(dg_station,dg_config,this); connect(dg_ripc,SIGNAL(userChanged()),this,SLOT(userChangedData())); dg_ripc->connectHost("localhost",RIPCD_TCP_PORT,dg_config->password()); diff --git a/utils/rdexport/rdexport.cpp b/utils/rdexport/rdexport.cpp index 9a36f7a1..4eccaafa 100644 --- a/utils/rdexport/rdexport.cpp +++ b/utils/rdexport/rdexport.cpp @@ -247,19 +247,19 @@ MainObject::MainObject(QObject *parent) exit(256); } - // - // RIPC Connection - // - export_ripc=new RDRipc(export_config->stationName()); - connect(export_ripc,SIGNAL(userChanged()),this,SLOT(userData())); - export_ripc-> - connectHost("localhost",RIPCD_TCP_PORT,export_config->password()); - // // Station Configuration // export_station=new RDStation(export_config->stationName()); + // + // RIPC Connection + // + export_ripc=new RDRipc(export_station,export_config,this); + connect(export_ripc,SIGNAL(userChanged()),this,SLOT(userData())); + export_ripc-> + connectHost("localhost",RIPCD_TCP_PORT,export_config->password()); + // // User // diff --git a/utils/rdgpimon/rdgpimon.cpp b/utils/rdgpimon/rdgpimon.cpp index 41b56311..2767890d 100644 --- a/utils/rdgpimon/rdgpimon.cpp +++ b/utils/rdgpimon/rdgpimon.cpp @@ -112,10 +112,15 @@ MainWidget::MainWidget(QWidget *parent) } new RDDbHeartbeat(gpi_config->mysqlHeartbeatInterval(),this); + // + // RDStation + // + gpi_station=new RDStation(gpi_config->stationName()); + // // RIPC Connection // - gpi_ripc=new RDRipc(gpi_config->stationName()); + gpi_ripc=new RDRipc(gpi_station,gpi_config,this); gpi_ripc->setIgnoreMask(true); connect(gpi_ripc,SIGNAL(userChanged()),this,SLOT(userData())); connect(gpi_ripc,SIGNAL(gpiStateChanged(int,int,bool)), @@ -132,11 +137,6 @@ MainWidget::MainWidget(QWidget *parent) this,SLOT(gpoCartChangedData(int,int,int,int))); gpi_ripc->connectHost("localhost",RIPCD_TCP_PORT,gpi_config->password()); - // - // RDStation - // - gpi_station=new RDStation(gpi_config->stationName()); - // // RDMatrix; // diff --git a/utils/rdimport/rdimport.cpp b/utils/rdimport/rdimport.cpp index d7f4866b..e9da7801 100644 --- a/utils/rdimport/rdimport.cpp +++ b/utils/rdimport/rdimport.cpp @@ -447,19 +447,19 @@ MainObject::MainObject(QObject *parent) } new RDDbHeartbeat(import_config->mysqlHeartbeatInterval(),this); - // - // RIPC Connection - // - import_ripc=new RDRipc(import_config->stationName()); - connect(import_ripc,SIGNAL(userChanged()),this,SLOT(userData())); - import_ripc-> - connectHost("localhost",RIPCD_TCP_PORT,import_config->password()); - // // Station Configuration // import_station=new RDStation(import_config->stationName()); + // + // RIPC Connection + // + import_ripc=new RDRipc(import_station,import_config,this); + connect(import_ripc,SIGNAL(userChanged()),this,SLOT(userData())); + import_ripc-> + connectHost("localhost",RIPCD_TCP_PORT,import_config->password()); + // // User // diff --git a/utils/rdmarkerset/rdmarkerset.cpp b/utils/rdmarkerset/rdmarkerset.cpp index 16a64f29..00a7dcb4 100644 --- a/utils/rdmarkerset/rdmarkerset.cpp +++ b/utils/rdmarkerset/rdmarkerset.cpp @@ -189,7 +189,7 @@ MainObject::MainObject(QObject *parent) // RIPCD Connection // set_user=NULL; - set_ripc=new RDRipc(set_config->stationName(),this); + set_ripc=new RDRipc(set_station,set_config,this); connect(set_ripc,SIGNAL(userChanged()),this,SLOT(userChangedData())); set_ripc->connectHost("localhost",RIPCD_TCP_PORT,set_config->password()); } diff --git a/utils/rdrender/rdrender.cpp b/utils/rdrender/rdrender.cpp index 98357f33..afffd32d 100644 --- a/utils/rdrender/rdrender.cpp +++ b/utils/rdrender/rdrender.cpp @@ -270,10 +270,15 @@ MainObject::MainObject(QObject *parent) } new RDDbHeartbeat(render_config->mysqlHeartbeatInterval(),this); + // + // Station Configuration + // + render_station=new RDStation(render_config->stationName()); + // // RIPC Connection // - render_ripc=new RDRipc(render_config->stationName()); + render_ripc=new RDRipc(render_station,render_config,this); connect(render_ripc,SIGNAL(userChanged()),this,SLOT(userData())); render_ripc-> connectHost("localhost",RIPCD_TCP_PORT,render_config->password()); @@ -286,11 +291,6 @@ MainObject::MainObject(QObject *parent) render_settings.setSampleRate(render_system->sampleRate()); } - // - // Station Configuration - // - render_station=new RDStation(render_config->stationName()); - // // User // diff --git a/utils/sas_shim/sas_shim.cpp b/utils/sas_shim/sas_shim.cpp index 671ef135..8b0e02b6 100644 --- a/utils/sas_shim/sas_shim.cpp +++ b/utils/sas_shim/sas_shim.cpp @@ -77,18 +77,18 @@ MainObject::MainObject(QObject *parent) } new RDDbHeartbeat(rd_config->mysqlHeartbeatInterval(),this); - // - // RIPCD Connection - // - shim_ripc=new RDRipc(""); - shim_ripc->connectHost("localhost",RIPCD_TCP_PORT,rd_config->password()); - // // Station Configuration // shim_rdstation=new RDStation(rd_config->stationName()); shim_address=shim_rdstation->address(); + // + // RIPCD Connection + // + shim_ripc=new RDRipc(shim_rdstation,rd_config,this); + shim_ripc->connectHost("localhost",RIPCD_TCP_PORT,rd_config->password()); + // // TTY Device //