diff --git a/Common/RepeaterHandler.cpp b/Common/RepeaterHandler.cpp index 4c119c2..b6573df 100644 --- a/Common/RepeaterHandler.cpp +++ b/Common/RepeaterHandler.cpp @@ -59,8 +59,8 @@ bool CRepeaterHandler::m_dtmfEnabled = true; CHeaderLogger* CRepeaterHandler::m_headerLogger = NULL; -CAPRSHandler* CRepeaterHandler::m_outgoingAprsWriter = NULL; -CAPRSHandler* CRepeaterHandler::m_incomingAprsWriter = NULL; +CAPRSHandler* CRepeaterHandler::m_outgoingAprsHandler = NULL; +CAPRSHandler* CRepeaterHandler::m_incomingAprsHandler = NULL; CCallsignList* CRepeaterHandler::m_restrictList = NULL; @@ -353,10 +353,10 @@ void CRepeaterHandler::setHeaderLogger(CHeaderLogger* logger) m_headerLogger = logger; } -void CRepeaterHandler::setAPRSWriters(CAPRSHandler* outgoingAprsWriter, CAPRSHandler* incomingAprsWriter) +void CRepeaterHandler::setAPRSHandlers(CAPRSHandler* outgoingAprsHandler, CAPRSHandler* incomingAprsHandler) { - m_outgoingAprsWriter = outgoingAprsWriter; - m_incomingAprsWriter = incomingAprsWriter; + m_outgoingAprsHandler = outgoingAprsHandler; + m_incomingAprsHandler = incomingAprsHandler; } void CRepeaterHandler::setLocalAddress(const std::string& address) @@ -615,8 +615,8 @@ void CRepeaterHandler::processRepeater(CHeaderData& header) m_text.clear(); // Reset the APRS Writer if it's enabled - if (m_outgoingAprsWriter != NULL) - m_outgoingAprsWriter->writeHeader(m_rptCallsign, header); + if (m_outgoingAprsHandler != NULL) + m_outgoingAprsHandler->writeHeader(m_rptCallsign, header); // Write to Header.log if it's enabled if (m_headerLogger != NULL) @@ -825,8 +825,8 @@ void CRepeaterHandler::processRepeater(CAMBEData& data) if (m_drats != NULL) m_drats->writeData(data); - if (m_outgoingAprsWriter != NULL) - m_outgoingAprsWriter->writeData(m_rptCallsign, data); + if (m_outgoingAprsHandler != NULL) + m_outgoingAprsHandler->writeData(m_rptCallsign, data); if (m_text.empty() && !data.isEnd()) { m_textCollector.writeData(data); @@ -1175,8 +1175,8 @@ bool CRepeaterHandler::process(CHeaderData& header, DIRECTION, AUDIO_SOURCE sour if (source == AS_DUP) return true; - if(m_incomingAprsWriter != nullptr) - m_incomingAprsWriter->writeHeader(m_rptCallsign, header); + if(m_incomingAprsHandler != nullptr) + m_incomingAprsHandler->writeHeader(m_rptCallsign, header); sendToIncoming(header); @@ -1217,8 +1217,8 @@ bool CRepeaterHandler::process(CAMBEData& data, DIRECTION, AUDIO_SOURCE source) m_repeaterHandler->writeAMBE(data); - if(m_incomingAprsWriter != nullptr) - m_incomingAprsWriter->writeData(m_rptCallsign, data); + if(m_incomingAprsHandler != nullptr) + m_incomingAprsHandler->writeData(m_rptCallsign, data); sendToIncoming(data); @@ -2421,8 +2421,8 @@ void CRepeaterHandler::startupInt() m_irc->rptrQTH(callsign, m_latitude, m_longitude, m_description1, m_description2, m_url); } - if(m_outgoingAprsWriter != nullptr) { - m_outgoingAprsWriter->addReadAPRSCallback(this); + if(m_outgoingAprsHandler != nullptr) { + m_outgoingAprsHandler->addReadAPRSCallback(this); } #ifdef USE_CCS @@ -2572,8 +2572,8 @@ void CRepeaterHandler::writeLinkingTo(const std::string &callsign) m_infoAudio->setStatus(m_linkStatus, m_linkRepeater, text); triggerInfo(); - if(m_outgoingAprsWriter != nullptr) - m_outgoingAprsWriter->writeStatus(m_rptCallsign, text); + if(m_outgoingAprsHandler != nullptr) + m_outgoingAprsHandler->writeStatus(m_rptCallsign, text); #ifdef USE_CCS m_ccsHandler->setReflector(); @@ -2627,8 +2627,8 @@ void CRepeaterHandler::writeLinkedTo(const std::string &callsign) m_infoAudio->setStatus(m_linkStatus, m_linkRepeater, text); triggerInfo(); - if(m_outgoingAprsWriter != nullptr) - m_outgoingAprsWriter->writeStatus(m_rptCallsign, text); + if(m_outgoingAprsHandler != nullptr) + m_outgoingAprsHandler->writeStatus(m_rptCallsign, text); #ifdef USE_CCS m_ccsHandler->setReflector(callsign); @@ -2682,8 +2682,8 @@ void CRepeaterHandler::writeNotLinked() m_infoAudio->setStatus(m_linkStatus, m_linkRepeater, text); triggerInfo(); - if(m_outgoingAprsWriter != nullptr) - m_outgoingAprsWriter->writeStatus(m_rptCallsign, text); + if(m_outgoingAprsHandler != nullptr) + m_outgoingAprsHandler->writeStatus(m_rptCallsign, text); #ifdef USE_CCS m_ccsHandler->setReflector(); @@ -2753,8 +2753,8 @@ void CRepeaterHandler::writeIsBusy(const std::string& callsign) m_infoAudio->setTempStatus(m_linkStatus, m_linkRepeater, tempText); triggerInfo(); - if(m_outgoingAprsWriter != nullptr) - m_outgoingAprsWriter->writeStatus(m_rptCallsign, text); + if(m_outgoingAprsHandler != nullptr) + m_outgoingAprsHandler->writeStatus(m_rptCallsign, text); #ifdef USE_CCS m_ccsHandler->setReflector(); diff --git a/Common/RepeaterHandler.h b/Common/RepeaterHandler.h index 5c34d3c..c5ed834 100644 --- a/Common/RepeaterHandler.h +++ b/Common/RepeaterHandler.h @@ -74,7 +74,7 @@ public: static void setDPlusEnabled(bool enabled); static void setDCSEnabled(bool enabled); static void setHeaderLogger(CHeaderLogger* logger); - static void setAPRSWriters(CAPRSHandler* outgoingAprsWriter, CAPRSHandler* incomingAprsWriter); + static void setAPRSHandlers(CAPRSHandler* outgoingAprsHandler, CAPRSHandler* incomingAprsHandler); static void setInfoEnabled(bool enabled); static void setEchoEnabled(bool enabled); static void setDTMFEnabled(bool enabled); @@ -169,8 +169,8 @@ private: static CHeaderLogger* m_headerLogger; - static CAPRSHandler* m_outgoingAprsWriter; - static CAPRSHandler* m_incomingAprsWriter; + static CAPRSHandler* m_outgoingAprsHandler; + static CAPRSHandler* m_incomingAprsHandler; static CCallsignList* m_whiteList; static CCallsignList* m_blackList; diff --git a/DStarGateway/DStarGatewayThread.cpp b/DStarGateway/DStarGatewayThread.cpp index 75182ef..3f4c218 100644 --- a/DStarGateway/DStarGatewayThread.cpp +++ b/DStarGateway/DStarGatewayThread.cpp @@ -76,8 +76,8 @@ m_dextraPool(nullptr), m_dplusPool(nullptr), m_dcsPool(nullptr), m_g2HandlerPool(nullptr), -m_outgoingAprsWriter(nullptr), -m_incomingAprsWriter(nullptr), +m_outgoingAprsHandler(nullptr), +m_incomingAprsHandler(nullptr), m_irc(nullptr), m_cache(), m_language(TL_ENGLISH_UK), @@ -251,7 +251,7 @@ void* CDStarGatewayThread::Entry() CRepeaterHandler::setDPlusEnabled(m_dplusEnabled); CRepeaterHandler::setDCSEnabled(m_dcsEnabled); CRepeaterHandler::setHeaderLogger(headerLogger); - CRepeaterHandler::setAPRSWriters(m_outgoingAprsWriter, m_incomingAprsWriter); + CRepeaterHandler::setAPRSHandlers(m_outgoingAprsHandler, m_incomingAprsHandler); CRepeaterHandler::setInfoEnabled(m_infoEnabled); CRepeaterHandler::setEchoEnabled(m_echoEnabled); CRepeaterHandler::setDTMFEnabled(m_dtmfEnabled); @@ -378,8 +378,8 @@ void* CDStarGatewayThread::Entry() m_statusFileTimer.start(); } - if (m_outgoingAprsWriter != NULL) - m_outgoingAprsWriter->clock(ms); + if (m_outgoingAprsHandler != NULL) + m_outgoingAprsHandler->clock(ms); if (m_logEnabled) { m_statusTimer1.clock(ms); @@ -470,9 +470,9 @@ void* CDStarGatewayThread::Entry() delete m_remote; } - if(m_outgoingAprsWriter != nullptr) { - m_outgoingAprsWriter->close(); - delete m_outgoingAprsWriter; + if(m_outgoingAprsHandler != nullptr) { + m_outgoingAprsHandler->close(); + delete m_outgoingAprsHandler; } if (headerLogger != NULL) { @@ -639,8 +639,8 @@ void CDStarGatewayThread::setLog(bool enabled) void CDStarGatewayThread::setAPRSWriters(CAPRSHandler* outgoingWriter, CAPRSHandler* incomingWriter) { - m_outgoingAprsWriter = outgoingWriter; - m_incomingAprsWriter = incomingWriter; + m_outgoingAprsHandler = outgoingWriter; + m_incomingAprsHandler = incomingWriter; } void CDStarGatewayThread::setInfoEnabled(bool enabled) @@ -1246,8 +1246,8 @@ void CDStarGatewayThread::writeStatus() CDStarGatewayStatusData* CDStarGatewayThread::getStatus() const { bool aprsStatus = false; - if (m_outgoingAprsWriter != NULL) - aprsStatus = m_outgoingAprsWriter->isConnected(); + if (m_outgoingAprsHandler != NULL) + aprsStatus = m_outgoingAprsHandler->isConnected(); CDStarGatewayStatusData* status = new CDStarGatewayStatusData(m_lastStatus, aprsStatus); diff --git a/DStarGateway/DStarGatewayThread.h b/DStarGateway/DStarGatewayThread.h index 83dddaf..26a799b 100644 --- a/DStarGateway/DStarGatewayThread.h +++ b/DStarGateway/DStarGatewayThread.h @@ -100,8 +100,8 @@ private: CDPlusProtocolHandlerPool* m_dplusPool; CDCSProtocolHandlerPool* m_dcsPool; CG2ProtocolHandlerPool* m_g2HandlerPool; - CAPRSHandler* m_outgoingAprsWriter; - CAPRSHandler* m_incomingAprsWriter; + CAPRSHandler* m_outgoingAprsHandler; + CAPRSHandler* m_incomingAprsHandler; CIRCDDB* m_irc; CCacheManager m_cache; TEXT_LANG m_language;