Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-31 14:13:52 +01:00
Code Issues Projects Releases Wiki Activity

2022-10-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed vestigal support for the 'Reload Heartbeat Configuration'
	catch protocol command.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-10-31 09:49:19 -04:00
parent 05ec302fc4
commit 47cf0d34e4
6 changed files with 5 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23590,3 +23590,6 @@
2022-10-31 Fred Gleason <fredg@paravelsystems.com>
* Removed vestigal support for the 'Heartbeat Pulse' catch
protocol command.
2022-10-31 Fred Gleason <fredg@paravelsystems.com>
* Removed vestigal support for the 'Reload Heartbeat Configuration'
catch protocol command.

8
lib/rdcatch_connect.cpp
View File

@@ -2,7 +2,7 @@
//
// Connect to the Rivendell Netcatcher Daemon.
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -84,12 +84,6 @@ void RDCatchConnect::enableMetering(bool state)
}
void RDCatchConnect::reloadHeartbeat()
{
SendCommand("RH!");
}
void RDCatchConnect::reloadDropboxes()
{
SendCommand("RX!");

3
lib/rdcatch_connect.h
View File

@@ -2,7 +2,7 @@
//
// Connect to the Rivendell Netcatcher Daemon.
//
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@@ -46,7 +46,6 @@ class RDCatchConnect : public QObject
RDDeck::Status status(unsigned chan) const;
int currentId(unsigned chan) const;
void enableMetering(bool state);
void reloadHeartbeat();
void reloadDropboxes();
public slots:

1
rdadmin/edit_station.cpp
View File

@@ -690,7 +690,6 @@ void EditStation::okData()
setEnforcePanelSetup(!station_panel_enforce_box->isChecked());
station_station->setHttpStation(station_http_station_box->currentText());
station_station->setCaeStation(station_cae_station_box->currentText());
station_catch_connect->reloadHeartbeat();
//
// Allow the event loop to run so the packets get delivered

44
rdcatchd/rdcatchd.cpp
View File

@@ -385,14 +385,6 @@ MainObject::MainObject(QObject *parent)
connect(timer,SIGNAL(timeout()),this,SLOT(meterData()));
timer->start(RD_METER_UPDATE_INTERVAL);
//
// Heartbeat Timer
//
catch_heartbeat_timer=new QTimer(this);
connect(catch_heartbeat_timer,SIGNAL(timeout()),
this,SLOT(sysHeartbeatData()));
LoadHeartbeat();
//
// Mark Interrupted Events
//
@@ -1266,16 +1258,6 @@ void MainObject::freeEventsData()
}
void MainObject::sysHeartbeatData()
{
RDCart *cart=new RDCart(catch_heartbeat_cart);
if(cart->exists()) {
ExecuteMacroCart(cart);
}
delete cart;
}
void MainObject::updateXloadsData()
{
std::vector<int>::iterator it;
@@ -1940,10 +1922,6 @@ void MainObject::DispatchCommand(ServerConnection *conn)
}
}
if(cmds.at(0)=="RH") { // Reload Heartbeat Configuration
LoadHeartbeat();
}
if((cmds.at(0)=="MN")&&(cmds.size()==3)) { // Monitor State
chan=cmds.at(1).toInt(&ok);
if(!ok) {
@@ -2488,28 +2466,6 @@ void MainObject::PurgeEvent(int event)
}
void MainObject::LoadHeartbeat()
{
if(catch_heartbeat_timer->isActive()) {
catch_heartbeat_timer->stop();
}
QString sql=QString("select ")+
"`HEARTBEAT_CART`,"+ // 00
"`HEARTBEAT_INTERVAL` "+ // 01
"from `STATIONS` where "+
"`NAME`='"+RDEscapeString(rda->station()->name())+"'";
RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) {
if((q->value(0).toUInt()!=0)&&(q->value(1).toUInt()!=0)) {
catch_heartbeat_cart=q->value(0).toUInt();
sysHeartbeatData();
catch_heartbeat_timer->start(q->value(1).toUInt());
}
}
delete q;
}
void MainObject::CheckInRecording(QString cutname,CatchEvent *evt,
unsigned msecs,unsigned threshold)
{

10
rdcatchd/rdcatchd.h
View File

@@ -109,8 +109,6 @@ class MainObject : public QObject
void meterData();
void eventFinishedData(int id);
void freeEventsData();
// void heartbeatData();
void sysHeartbeatData();
void updateXloadsData();
void startupCartData();
void notificationReceivedData(RDNotification *notify);
@@ -198,7 +196,6 @@ class MainObject : public QObject
int16_t tcp_port;
QTcpServer *server;
RDCatchConnect *catch_connect;
QList<ServerConnection *> catch_connections;
QSignalMapper *catch_ready_mapper;
QSignalMapper *catch_kill_mapper;
@@ -212,11 +209,9 @@ class MainObject : public QObject
int catch_record_id[MAX_DECKS];
QString catch_record_name[MAX_DECKS];
bool catch_record_aborting[MAX_DECKS];
unsigned catch_record_pending_cartnum[MAX_DECKS];
unsigned catch_record_pending_cutnum[MAX_DECKS];
unsigned catch_record_pending_maxlen[MAX_DECKS];
bool catch_playout_status[MAX_DECKS];
int catch_playout_card[MAX_DECKS];
int catch_playout_stream[MAX_DECKS];
@@ -227,10 +222,8 @@ class MainObject : public QObject
int catch_playout_id[MAX_DECKS];
QString catch_playout_name[MAX_DECKS];
EventPlayer *catch_playout_event_player[MAX_DECKS];
int catch_monitor_port[MAX_DECKS];
bool catch_monitor_state[MAX_DECKS];
unsigned catch_record_threshold[MAX_DECKS];
QHostAddress catch_swaddress[MAX_DECKS];
int catch_swmatrix[MAX_DECKS];
@@ -245,9 +238,6 @@ class MainObject : public QObject
int catch_macro_event_id[RDCATCHD_MAX_MACROS];
QSignalMapper *catch_event_mapper;
std::vector<CatchEvent> catch_events;
QTimer *catch_heartbeat_timer;
unsigned catch_heartbeat_cart;
int catch_default_format;
int catch_default_channels;
int catch_default_layer;