KB8PMY
/
F4KXL_DStarGateway
mirror of https://github.com/F4FXL/DStarGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename IRCDDBGatewaysStatusData -> DStarGetwayStatusData

Browse Source
pull/32/head
Geoffrey Merck 4 years ago
parent c56c42d283
commit e0ea97d8fc
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File

22
DStarGatewayStatusData.cpp
Unescape View File

@ -21,17 +21,17 @@
#include "DStarGatewayStatusData.h" #include "DStarGatewayStatusData.h"
CIRCDDBGatewayStatusData::CIRCDDBGatewayStatusData(IRCDDB_STATUS ircDDBStatus, bool dprsStatus) : CDStarGatewayStatusData::CDStarGatewayStatusData(IRCDDB_STATUS ircDDBStatus, bool dprsStatus) :
m_ircDDBStatus(ircDDBStatus), m_ircDDBStatus(ircDDBStatus),
m_dprsStatus(dprsStatus) m_dprsStatus(dprsStatus)
{ {
} }
CIRCDDBGatewayStatusData::~CIRCDDBGatewayStatusData() CDStarGatewayStatusData::~CDStarGatewayStatusData()
{ {
} }
void CIRCDDBGatewayStatusData::setRepeater(unsigned int n, const std::string& callsign, LINK_STATUS linkStatus, const std::string& linkCallsign, const std::string& incoming) void CDStarGatewayStatusData::setRepeater(unsigned int n, const std::string& callsign, LINK_STATUS linkStatus, const std::string& linkCallsign, const std::string& incoming)
{ {
assert(n < 4U); assert(n < 4U);
@ -41,50 +41,50 @@ void CIRCDDBGatewayStatusData::setRepeater(unsigned int n, const std::string& ca
m_incoming[n] = incoming; m_incoming[n] = incoming;
} }
void CIRCDDBGatewayStatusData::setDongles(const std::string& dongles) void CDStarGatewayStatusData::setDongles(const std::string& dongles)
{ {
m_dongles = dongles; m_dongles = dongles;
} }
IRCDDB_STATUS CIRCDDBGatewayStatusData::getIrcDDBStatus() const IRCDDB_STATUS CDStarGatewayStatusData::getIrcDDBStatus() const
{ {
return m_ircDDBStatus; return m_ircDDBStatus;
} }
bool CIRCDDBGatewayStatusData::getDPRSStatus() const bool CDStarGatewayStatusData::getDPRSStatus() const
{ {
return m_dprsStatus; return m_dprsStatus;
} }
std::string CIRCDDBGatewayStatusData::getCallsign(unsigned int n) const std::string CDStarGatewayStatusData::getCallsign(unsigned int n) const
{ {
assert(n < 4U); assert(n < 4U);
return m_callsign[n]; return m_callsign[n];
} }
LINK_STATUS CIRCDDBGatewayStatusData::getLinkStatus(unsigned int n) const LINK_STATUS CDStarGatewayStatusData::getLinkStatus(unsigned int n) const
{ {
assert(n < 4U); assert(n < 4U);
return m_linkStatus[n]; return m_linkStatus[n];
} }
std::string CIRCDDBGatewayStatusData::getLinkCallsign(unsigned int n) const std::string CDStarGatewayStatusData::getLinkCallsign(unsigned int n) const
{ {
assert(n < 4U); assert(n < 4U);
return m_linkCallsign[n]; return m_linkCallsign[n];
} }
std::string CIRCDDBGatewayStatusData::getIncoming(unsigned int n) const std::string CDStarGatewayStatusData::getIncoming(unsigned int n) const
{ {
assert(n < 4U); assert(n < 4U);
return m_incoming[n]; return m_incoming[n];
} }
std::string CIRCDDBGatewayStatusData::getDongles() const std::string CDStarGatewayStatusData::getDongles() const
{ {
return m_dongles; return m_dongles;
} }

6
DStarGatewayStatusData.h
Unescape View File

@ -22,10 +22,10 @@
#include "Defs.h" #include "Defs.h"
class CIRCDDBGatewayStatusData { class CDStarGatewayStatusData {
public: public:
CIRCDDBGatewayStatusData(IRCDDB_STATUS ircDDBStatus, bool dprsStatus); CDStarGatewayStatusData(IRCDDB_STATUS ircDDBStatus, bool dprsStatus);
~CIRCDDBGatewayStatusData(); ~CDStarGatewayStatusData();
void setRepeater(unsigned int n, const std::string& callsign, LINK_STATUS linkStatus, const std::string& linkCallsign, const std::string& incoming); void setRepeater(unsigned int n, const std::string& callsign, LINK_STATUS linkStatus, const std::string& linkCallsign, const std::string& incoming);

8
DStarGatewayThread.cpp
Unescape View File

@ -424,10 +424,10 @@ void* CDStarGatewayThread::Entry()
} }
catch (std::exception& e) { catch (std::exception& e) {
std::string message(e.what()); std::string message(e.what());
CLog::logError("Exception raised in the main thread - \"%s\"", message.c_str()); CLog::logFatal("Exception raised in the main thread - \"%s\"", message.c_str());
} }
catch (...) { catch (...) {
CLog::logError("Unknown exception raised in the main thread"); CLog::logFatal("Unknown exception raised in the main thread");
} }
CLog::logInfo("Stopping the ircDDB Gateway thread"); CLog::logInfo("Stopping the ircDDB Gateway thread");
@ -1203,13 +1203,13 @@ void CDStarGatewayThread::writeStatus()
file.close(); file.close();
} }
CIRCDDBGatewayStatusData* CDStarGatewayThread::getStatus() const CDStarGatewayStatusData* CDStarGatewayThread::getStatus() const
{ {
bool aprsStatus = false; bool aprsStatus = false;
if (m_aprsWriter != NULL) if (m_aprsWriter != NULL)
aprsStatus = m_aprsWriter->isConnected(); aprsStatus = m_aprsWriter->isConnected();
CIRCDDBGatewayStatusData* status = new CIRCDDBGatewayStatusData(m_lastStatus, aprsStatus); CDStarGatewayStatusData* status = new CDStarGatewayStatusData(m_lastStatus, aprsStatus);
for (unsigned int i = 0U; i < 4U; i++) { for (unsigned int i = 0U; i < 4U; i++) {
std::string callsign, linkCallsign; std::string callsign, linkCallsign;

2
DStarGatewayThread.h
Unescape View File

@ -83,7 +83,7 @@ virtual void addRepeater(const std::string& callsign, const std::string& band, c
virtual void setBlackList(CCallsignList* list); virtual void setBlackList(CCallsignList* list);
virtual void setRestrictList(CCallsignList* list); virtual void setRestrictList(CCallsignList* list);
virtual CIRCDDBGatewayStatusData* getStatus() const; virtual CDStarGatewayStatusData* getStatus() const;
virtual void kill(); virtual void kill();

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.