From 05ec302fc4ebad9caacc68b5c1b8c481cf41c261 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 31 Oct 2022 09:41:46 -0400 Subject: [PATCH] 2022-10-31 Fred Gleason * Removed vestigal support for the 'Reload Deck List' catch protocol command. * Removed vestigal support for the 'Reload Event List' catch protocol command. * Removed vestigal support for the 'Reload Event List' catch protocol command. * Removed vestigal support for the 'Reload Time Offset' catch protocol command. Signed-off-by: Fred Gleason --- ChangeLog | 3 + docs/apis/catchd.xml | 231 ---------------------------------------- lib/rdcatch_connect.cpp | 22 +--- lib/rdcatch_connect.h | 4 - rdcatchd/rdcatchd.cpp | 13 --- rdcatchd/rdcatchd.h | 2 +- 6 files changed, 6 insertions(+), 269 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b5bceac..23303c4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23587,3 +23587,6 @@ protocol command. * Removed vestigal support for the 'Reload Time Offset' catch protocol command. +2022-10-31 Fred Gleason + * Removed vestigal support for the 'Heartbeat Pulse' catch + protocol command. diff --git a/docs/apis/catchd.xml b/docs/apis/catchd.xml index 0cf04173..e4742e47 100644 --- a/docs/apis/catchd.xml +++ b/docs/apis/catchd.xml @@ -66,41 +66,6 @@ No authentication is required to execute these. - - Drop Connection - - End the session and drop the TCP connection. - - - DC! - - - - - Send Password - - Send a password to the server for authentication. - - - PW passwd! - - - - - passwd - - - A password to be supplied before granting the client access. - - - - - rdcatchd8 will respond - with PW +! or - PW -!, indicating the success or - failure of the authentication. - - @@ -109,157 +74,6 @@ A connection must be authenticated before these can be executed. - - Deck Event Processed - - Sent by RDCatchd whenever a deck event is processed. - - - DE deck-num - event-num! - - - - deck-num - - - The number of the deck originating the event. Record decks have - numbers in the range 1 through - 127, while Play decks have - numbers in the range 128 through - 254. - - - - - event-num - - - The new event state of the specified deck. - - - - - - See for - the list of possible deck event states. - - - - Reload Deck List - - Reload the record/play deck configuration. - - - RD! - - - rdcatchd8 will respond with - RS +!. - - - - Reload Event List - - Reload the list of scheduled events. - - - RS! - - - rdcatchd8 will respond with - RS +!. - - - - Request Deck Status - - Request the current deck status. - - - RE deck-num! - - - - deck-num - - - The number of the deck for which to return status. - - - - - - If deck-num is greater than zero, - rdcatchd8 will respond with - RE deck-num - status id - cutname! - - - - deck-num - - - Channel number - - - - - status - - - The current status of the deck. Possible values are: - - - - Deck Status Codes - - - - - CodeMeaning - - - 0Offline - 1Idle - 2Ready - 3Active (playing or recording) - 4Waiting (for a GPI) - - -
- - - - - event-id - - - ID number of current event (from RECORDINGS table) - - - - - cutname - - - The cutname of the event (present only for - status==3). - - - - - - If channel is zero, - rdcatchd8 will respond for - every event whose status is non-idle. - - - An RE packet will also be sent - automatically to all active connections upon any change of deck status. - - Enable Metering @@ -337,41 +151,6 @@ - - Purge Event - - Report purging of one-shot event. - - - PE event-num! - - - - event-num - - - The number of the purged event. - - - - - - Received upon completion of a one-shot event by - rdcatchd8 to indicate that - the event has been purged. - - - - - Reload Time Offset - - Reload the time offset value from the database. - - - RO! - - - Reload Heartbeat Configuration @@ -382,16 +161,6 @@ - - Heartbeat Pulse - - Heartbeat Pulse, for connection keep-alive. - - - HB! - - - Input Monitor State diff --git a/lib/rdcatch_connect.cpp b/lib/rdcatch_connect.cpp index 25768db9..78d93955 100644 --- a/lib/rdcatch_connect.cpp +++ b/lib/rdcatch_connect.cpp @@ -43,16 +43,6 @@ RDCatchConnect::RDCatchConnect(int serial,QObject *parent) cc_socket=new QTcpSocket(this); connect(cc_socket,SIGNAL(connected()),this,SLOT(connectedData())); connect(cc_socket,SIGNAL(readyRead()),this,SLOT(readyData())); - - // - // Start the heartbeat timer - // - cc_heartbeat_timer=new QTimer(this); - cc_heartbeat_timer->setSingleShot(true); - connect(cc_heartbeat_timer,SIGNAL(timeout()), - this,SLOT(heartbeatTimeoutData())); - cc_heartbeat_timer->start(CC_HEARTBEAT_INTERVAL); - cc_heartbeat_valid=true; } @@ -189,15 +179,6 @@ void RDCatchConnect::readyData() } -void RDCatchConnect::heartbeatTimeoutData() -{ - if(cc_heartbeat_valid) { - emit heartbeatFailed(cc_serial); - cc_heartbeat_valid=false; - } -} - - void RDCatchConnect::SendCommand(QString cmd) { // printf("SendCommand(%s)\n",(const char *)cmd); @@ -302,11 +283,12 @@ void RDCatchConnect::DispatchCommand() emit eventPurged(id); } */ + /* if(!strcmp(args[0],"HB")) { // Heartbeat cc_heartbeat_timer->stop(); cc_heartbeat_timer->start(CC_HEARTBEAT_INTERVAL); } - + */ if(!strcmp(args[0],"MN")) { // Monitor State if(sscanf(args[1],"%d",&deck)!=1) { return; diff --git a/lib/rdcatch_connect.h b/lib/rdcatch_connect.h index 89693986..103bcbb6 100644 --- a/lib/rdcatch_connect.h +++ b/lib/rdcatch_connect.h @@ -63,13 +63,10 @@ class RDCatchConnect : public QObject void meterLevel(int serial,int deck,int chan,int level); void eventUpdated(int id); void eventPurged(int id); - // void deckEventSent(int serial,int chan,int number); - void heartbeatFailed(int id); private slots: void connectedData(); void readyData(); - void heartbeatTimeoutData(); private: void SendCommand(QString cmd); @@ -86,7 +83,6 @@ class RDCatchConnect : public QObject int cc_record_id[MAX_DECKS]; int cc_play_id[MAX_DECKS]; int cc_serial; - QTimer *cc_heartbeat_timer; bool cc_heartbeat_valid; bool cc_monitor_state[MAX_DECKS]; }; diff --git a/rdcatchd/rdcatchd.cpp b/rdcatchd/rdcatchd.cpp index 75b6afe8..6688c07b 100644 --- a/rdcatchd/rdcatchd.cpp +++ b/rdcatchd/rdcatchd.cpp @@ -378,13 +378,6 @@ MainObject::MainObject(QObject *parent) ::signal(SIGTERM,SigHandler); ::signal(SIGCHLD,SigHandler); - // - // Start Heartbeat Timer - // - timer=new QTimer(this); - connect(timer,SIGNAL(timeout()),this,SLOT(heartbeatData())); - timer->start(RDCATCHD_HEARTBEAT_INTERVAL); - // // Meter Timer // @@ -1273,12 +1266,6 @@ void MainObject::freeEventsData() } -void MainObject::heartbeatData() -{ - BroadcastCommand("HB!"); -} - - void MainObject::sysHeartbeatData() { RDCart *cart=new RDCart(catch_heartbeat_cart); diff --git a/rdcatchd/rdcatchd.h b/rdcatchd/rdcatchd.h index 70b5797e..b6b4792d 100644 --- a/rdcatchd/rdcatchd.h +++ b/rdcatchd/rdcatchd.h @@ -109,7 +109,7 @@ class MainObject : public QObject void meterData(); void eventFinishedData(int id); void freeEventsData(); - void heartbeatData(); + // void heartbeatData(); void sysHeartbeatData(); void updateXloadsData(); void startupCartData();