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

get rid of wxT macro

Browse Source
master
Geoffrey Merck 4 years ago
parent 929d5b4910
commit 1a70c7f3a4
14 changed files with 228 additions and 229 deletions
Show Stats Download Patch File Download Diff File

12
APRSCollector.cpp
Unescape View File

@ -181,11 +181,11 @@ void CAPRSCollector::addGGAData()
bool ret = checkXOR(m_ggaData + 1U, m_ggaLength - 1U); bool ret = checkXOR(m_ggaData + 1U, m_ggaLength - 1U);
if (ret) { if (ret) {
// CUtils::dump(wxT("$GPGGA Valid"), m_ggaData, m_ggaLength); // CUtils::dump("$GPGGA Valid", m_ggaData, m_ggaLength);
m_ggaValid = true; m_ggaValid = true;
m_state = AS_RMC; m_state = AS_RMC;
} else { } else {
// CUtils::dump(wxT("$GPGGA Bad checksum"), m_ggaData, m_ggaLength); // CUtils::dump("$GPGGA Bad checksum", m_ggaData, m_ggaLength);
m_ggaLength = 0U; m_ggaLength = 0U;
m_ggaValid = false; m_ggaValid = false;
m_state = AS_RMC; m_state = AS_RMC;
@ -225,10 +225,10 @@ bool CAPRSCollector::addRMCData()
bool ret = checkXOR(m_rmcData + 1U, m_rmcLength - 1U); bool ret = checkXOR(m_rmcData + 1U, m_rmcLength - 1U);
if (ret) { if (ret) {
// CUtils::dump(wxT("$GPRMC Valid"), m_rmcData, m_rmcLength); // CUtils::dump("$GPRMC Valid", m_rmcData, m_rmcLength);
m_rmcValid = true; m_rmcValid = true;
} else { } else {
// CUtils::dump(wxT("$GPRMC Bad checksum"), m_rmcData, m_rmcLength); // CUtils::dump("$GPRMC Bad checksum", m_rmcData, m_rmcLength);
m_rmcLength = 0U; m_rmcLength = 0U;
m_rmcValid = false; m_rmcValid = false;
} }
@ -270,13 +270,13 @@ bool CAPRSCollector::addCRCData()
bool ret = checkCRC(m_crcData, m_crcLength); bool ret = checkCRC(m_crcData, m_crcLength);
if (ret) { if (ret) {
// CUtils::dump(wxT("$$CRC Valid"), m_crcData, m_crcLength); // CUtils::dump("$$CRC Valid", m_crcData, m_crcLength);
m_crcValid = true; m_crcValid = true;
m_state = AS_NONE; m_state = AS_NONE;
m_collector = m_collector.substr(n2); m_collector = m_collector.substr(n2);
return true; return true;
} else { } else {
// CUtils::dump(wxT("$$CRC Bad checksum"), m_crcData, m_crcLength); // CUtils::dump("$$CRC Bad checksum", m_crcData, m_crcLength);
m_crcLength = 0U; m_crcLength = 0U;
m_crcValid = false; m_crcValid = false;
m_state = AS_NONE; m_state = AS_NONE;

86
APRSWriter.cpp
Unescape View File

@ -275,7 +275,7 @@ void CAPRSWriter::writeData(const std::string& callsign, const CAMBEData& data)
if (n != std::string::npos) if (n != std::string::npos)
body = body.substr(0, n); body = body.substr(0, n);
std::string output = CStringUtils::string_format(wxT("%s,qAR,%s-%s:%s"), header.c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), body.c_str()); std::string output = CStringUtils::string_format("%s,qAR,%s-%s:%s", header.c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), body.c_str());
char ascii[500U]; char ascii[500U];
::memset(ascii, 0x00, 500U); ::memset(ascii, 0x00, 500U);
@ -361,25 +361,25 @@ void CAPRSWriter::sendIdFramesFixed()
desc = "Data"; desc = "Data";
} else { } else {
if (entry->getFrequency() != 0.0) if (entry->getFrequency() != 0.0)
desc = CStringUtils::string_format(wxT("Voice %.5lfMHz %c%.4lfMHz"), desc = CStringUtils::string_format("Voice %.5lfMHz %c%.4lfMHz",
entry->getFrequency(), entry->getFrequency(),
entry->getOffset() < 0.0 ? '-' : '+', entry->getOffset() < 0.0 ? '-' : '+',
::fabs(entry->getOffset())); ::fabs(entry->getOffset()));
else else
desc = wxT("Voice"); desc = "Voice";
} }
std::string band; std::string band;
if (entry->getFrequency() >= 1200.0) if (entry->getFrequency() >= 1200.0)
band = wxT("1.2"); band = "1.2";
else if (entry->getFrequency() >= 420.0) else if (entry->getFrequency() >= 420.0)
band = wxT("440"); band = "440";
else if (entry->getFrequency() >= 144.0) else if (entry->getFrequency() >= 144.0)
band = wxT("2m"); band = "2m";
else if (entry->getFrequency() >= 50.0) else if (entry->getFrequency() >= 50.0)
band = wxT("6m"); band = "6m";
else if (entry->getFrequency() >= 28.0) else if (entry->getFrequency() >= 28.0)
band = wxT("10m"); band = "10m";
double tempLat = ::fabs(entry->getLatitude()); double tempLat = ::fabs(entry->getLatitude());
double tempLong = ::fabs(entry->getLongitude()); double tempLong = ::fabs(entry->getLongitude());
@ -392,32 +392,32 @@ void CAPRSWriter::sendIdFramesFixed()
std::string lat; std::string lat;
if (latitude >= 1000.0F) if (latitude >= 1000.0F)
lat = CStringUtils::string_format(wxT("%.2lf"), latitude); lat = CStringUtils::string_format("%.2lf", latitude);
else if (latitude >= 100.0F) else if (latitude >= 100.0F)
lat = CStringUtils::string_format(wxT("0%.2lf"), latitude); lat = CStringUtils::string_format("0%.2lf", latitude);
else if (latitude >= 10.0F) else if (latitude >= 10.0F)
lat = CStringUtils::string_format(wxT("00%.2lf"), latitude); lat = CStringUtils::string_format("00%.2lf", latitude);
else else
lat = CStringUtils::string_format(wxT("000%.2lf"), latitude); lat = CStringUtils::string_format("000%.2lf", latitude);
std::string lon; std::string lon;
if (longitude >= 10000.0F) if (longitude >= 10000.0F)
lon = CStringUtils::string_format(wxT("%.2lf"), longitude); lon = CStringUtils::string_format("%.2lf", longitude);
else if (longitude >= 1000.0F) else if (longitude >= 1000.0F)
lon = CStringUtils::string_format(wxT("0%.2lf"), longitude); lon = CStringUtils::string_format("0%.2lf", longitude);
else if (longitude >= 100.0F) else if (longitude >= 100.0F)
lon = CStringUtils::string_format(wxT("00%.2lf"), longitude); lon = CStringUtils::string_format("00%.2lf", longitude);
else if (longitude >= 10.0F) else if (longitude >= 10.0F)
lon = CStringUtils::string_format(wxT("000%.2lf"), longitude); lon = CStringUtils::string_format("000%.2lf", longitude);
else else
lon = CStringUtils::string_format(wxT("0000%.2lf"), longitude); lon = CStringUtils::string_format("0000%.2lf", longitude);
// Convert commas to periods in the latitude and longitude // Convert commas to periods in the latitude and longitude
boost::replace_all(lat, wxT(","), wxT(".")); boost::replace_all(lat, ",", ".");
boost::replace_all(lon, ",", wxT(".")); boost::replace_all(lon, ",", ".");
std::string output; std::string output;
output = CStringUtils::string_format(wxT("%s-S>APDST1,TCPIP*,qAC,%s-GS:;%-7s%-2s*%02d%02d%02dz%s%cD%s%caRNG%04.0lf/A=%06.0lf %s %s"), output = CStringUtils::string_format("%s-S>APDST1,TCPIP*,qAC,%s-GS:;%-7s%-2s*%02d%02d%02dz%s%cD%s%caRNG%04.0lf/A=%06.0lf %s %s",
m_gateway.c_str(), m_gateway.c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), m_gateway.c_str(), m_gateway.c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(),
tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_mday, tm->tm_hour, tm->tm_min,
lat.c_str(), (entry->getLatitude() < 0.0F) ? 'S' : 'N', lat.c_str(), (entry->getLatitude() < 0.0F) ? 'S' : 'N',
@ -432,7 +432,7 @@ void CAPRSWriter::sendIdFramesFixed()
m_thread->write(ascii); m_thread->write(ascii);
if (entry->getBand().length() == 1U) { if (entry->getBand().length() == 1U) {
output = CStringUtils::string_format(wxT("%s-%s>APDST2,TCPIP*,qAC,%s-%sS:!%s%cD%s%c&RNG%04.0lf/A=%06.0lf %s %s"), output = CStringUtils::string_format("%s-%s>APDST2,TCPIP*,qAC,%s-%sS:!%s%cD%s%c&RNG%04.0lf/A=%06.0lf %s %s",
entry->getCallsign().c_str(), entry->getBand().c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(),
lat.c_str(), (entry->getLatitude() < 0.0F) ? 'S' : 'N', lat.c_str(), (entry->getLatitude() < 0.0F) ? 'S' : 'N',
lon.c_str(), (entry->getLongitude() < 0.0F) ? 'W' : 'E', lon.c_str(), (entry->getLongitude() < 0.0F) ? 'W' : 'E',
@ -488,30 +488,30 @@ void CAPRSWriter::sendIdFramesMobile()
std::string desc; std::string desc;
if (entry->getBand().length() > 1U) { if (entry->getBand().length() > 1U) {
if (entry->getFrequency() != 0.0) if (entry->getFrequency() != 0.0)
desc = CStringUtils::string_format(wxT("Data %.5lfMHz"), entry->getFrequency()); desc = CStringUtils::string_format("Data %.5lfMHz", entry->getFrequency());
else else
desc = wxT("Data"); desc = "Data";
} else { } else {
if (entry->getFrequency() != 0.0) if (entry->getFrequency() != 0.0)
desc = CStringUtils::string_format(wxT("Voice %.5lfMHz %c%.4lfMHz"), desc = CStringUtils::string_format("Voice %.5lfMHz %c%.4lfMHz",
entry->getFrequency(), entry->getFrequency(),
entry->getOffset() < 0.0 ? '-' : '+', entry->getOffset() < 0.0 ? '-' : '+',
::fabs(entry->getOffset())); ::fabs(entry->getOffset()));
else else
desc = wxT("Voice"); desc = "Voice";
} }
std::string band; std::string band;
if (entry->getFrequency() >= 1200.0) if (entry->getFrequency() >= 1200.0)
band = wxT("1.2"); band = "1.2";
else if (entry->getFrequency() >= 420.0) else if (entry->getFrequency() >= 420.0)
band = wxT("440"); band = "440";
else if (entry->getFrequency() >= 144.0) else if (entry->getFrequency() >= 144.0)
band = wxT("2m"); band = "2m";
else if (entry->getFrequency() >= 50.0) else if (entry->getFrequency() >= 50.0)
band = wxT("6m"); band = "6m";
else if (entry->getFrequency() >= 28.0) else if (entry->getFrequency() >= 28.0)
band = wxT("10m"); band = "10m";
double tempLat = ::fabs(rawLatitude); double tempLat = ::fabs(rawLatitude);
double tempLong = ::fabs(rawLongitude); double tempLong = ::fabs(rawLongitude);
@ -524,32 +524,32 @@ void CAPRSWriter::sendIdFramesMobile()
std::string lat; std::string lat;
if (latitude >= 1000.0F) if (latitude >= 1000.0F)
lat = CStringUtils::string_format(wxT("%.2lf"), latitude); lat = CStringUtils::string_format("%.2lf", latitude);
else if (latitude >= 100.0F) else if (latitude >= 100.0F)
lat = CStringUtils::string_format(wxT("0%.2lf"), latitude); lat = CStringUtils::string_format("0%.2lf", latitude);
else if (latitude >= 10.0F) else if (latitude >= 10.0F)
lat = CStringUtils::string_format(wxT("00%.2lf"), latitude); lat = CStringUtils::string_format("00%.2lf", latitude);
else else
lat = CStringUtils::string_format(wxT("000%.2lf"), latitude); lat = CStringUtils::string_format("000%.2lf", latitude);
std::string lon; std::string lon;
if (longitude >= 10000.0F) if (longitude >= 10000.0F)
lon = CStringUtils::string_format(wxT("%.2lf"), longitude); lon = CStringUtils::string_format("%.2lf", longitude);
else if (longitude >= 1000.0F) else if (longitude >= 1000.0F)
lon = CStringUtils::string_format(wxT("0%.2lf"), longitude); lon = CStringUtils::string_format("0%.2lf", longitude);
else if (longitude >= 100.0F) else if (longitude >= 100.0F)
lon = CStringUtils::string_format(wxT("00%.2lf"), longitude); lon = CStringUtils::string_format("00%.2lf", longitude);
else if (longitude >= 10.0F) else if (longitude >= 10.0F)
lon = CStringUtils::string_format(wxT("000%.2lf"), longitude); lon = CStringUtils::string_format("000%.2lf", longitude);
else else
lon = CStringUtils::string_format(wxT("0000%.2lf"), longitude); lon = CStringUtils::string_format("0000%.2lf", longitude);
// Convert commas to periods in the latitude and longitude // Convert commas to periods in the latitude and longitude
boost::replace_all(lat, ",", "."); boost::replace_all(lat, ",", ".");
boost::replace_all(lon, ",", "."); boost::replace_all(lon, ",", ".");
std::string output1; std::string output1;
output1 = CStringUtils::string_format(wxT("%s-S>APDST1,TCPIP*,qAC,%s-GS:;%-7s%-2s*%02d%02d%02dz%s%cD%s%ca/A=%06.0lf"), output1 = CStringUtils::string_format("%s-S>APDST1,TCPIP*,qAC,%s-GS:;%-7s%-2s*%02d%02d%02dz%s%cD%s%ca/A=%06.0lf",
m_gateway.c_str(), m_gateway.c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), m_gateway.c_str(), m_gateway.c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(),
tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_mday, tm->tm_hour, tm->tm_min,
lat.c_str(), (rawLatitude < 0.0) ? 'S' : 'N', lat.c_str(), (rawLatitude < 0.0) ? 'S' : 'N',
@ -561,11 +561,11 @@ void CAPRSWriter::sendIdFramesMobile()
double rawBearing = ::atof(pBearing); double rawBearing = ::atof(pBearing);
double rawVelocity = ::atof(pVelocity); double rawVelocity = ::atof(pVelocity);
output2 = CStringUtils::string_format(wxT("%03.0lf/%03.0lf"), rawBearing, rawVelocity * 0.539957F); output2 = CStringUtils::string_format("%03.0lf/%03.0lf", rawBearing, rawVelocity * 0.539957F);
} }
std::string output3; std::string output3;
output3 = CStringUtils::string_format(wxT("RNG%04.0lf %s %s"), entry->getRange() * 0.6214, band.c_str(), desc.c_str()); output3 = CStringUtils::string_format("RNG%04.0lf %s %s", entry->getRange() * 0.6214, band.c_str(), desc.c_str());
char ascii[300U]; char ascii[300U];
::memset(ascii, 0x00, 300U); ::memset(ascii, 0x00, 300U);
@ -580,7 +580,7 @@ void CAPRSWriter::sendIdFramesMobile()
m_thread->write(ascii); m_thread->write(ascii);
if (entry->getBand().length() == 1U) { if (entry->getBand().length() == 1U) {
output1 = CStringUtils::string_format(wxT("%s-%s>APDST2,TCPIP*,qAC,%s-%sS:!%s%cD%s%c&/A=%06.0lf"), output1 = CStringUtils::string_format("%s-%s>APDST2,TCPIP*,qAC,%s-%sS:!%s%cD%s%c&/A=%06.0lf",
entry->getCallsign().c_str(), entry->getBand().c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(), entry->getCallsign().c_str(), entry->getBand().c_str(),
lat.c_str(), (rawLatitude < 0.0) ? 'S' : 'N', lat.c_str(), (rawLatitude < 0.0) ? 'S' : 'N',
lon.c_str(), (rawLongitude < 0.0) ? 'W' : 'E', lon.c_str(), (rawLongitude < 0.0) ? 'W' : 'E',

2
APRSWriterThread.cpp
Unescape View File

@ -149,7 +149,7 @@ void* CAPRSWriterThread::Entry()
int length = m_socket.readLine(line, APRS_TIMEOUT); int length = m_socket.readLine(line, APRS_TIMEOUT);
/*if (length == 0) /*if (length == 0)
CLog::logWarning((wxT("No response from the APRS server after %u seconds"), APRS_TIMEOUT);*/ CLog::logWarning(("No response from the APRS server after %u seconds", APRS_TIMEOUT);*/
if (length < 0) { if (length < 0) {
m_connected = false; m_connected = false;

2
AudioUnit.cpp
Unescape View File

@ -248,7 +248,7 @@ bool CAudioUnit::lookup(unsigned int id, const std::string &name)
{ {
CIndexRecord* info = m_index[name]; CIndexRecord* info = m_index[name];
if (info == NULL) { if (info == NULL) {
// CLog::logError(wxT("Cannot find the AMBE index for *%s*"), name.c_str()); // CLog::logError("Cannot find the AMBE index for *%s*", name.c_str());
return false; return false;
} }

2
CCSData.cpp
Unescape View File

@ -93,7 +93,7 @@ bool CCCSData::setCCSData(const unsigned char *data, unsigned int length, const
if (0 == memcmp(data + 8U, "0001", 4U)) { if (0 == memcmp(data + 8U, "0001", 4U)) {
m_type = CT_TERMINATE; m_type = CT_TERMINATE;
} else { } else {
// CUtils::dump(wxT("Invalid CCS packet"), data, length); // CUtils::dump("Invalid CCS packet", data, length);
return false; return false;
} }
memcpy(buffer, data+12, LONG_CALLSIGN_LENGTH); memcpy(buffer, data+12, LONG_CALLSIGN_LENGTH);

2
DCSHandler.cpp
Unescape View File

@ -590,7 +590,7 @@ void CDCSHandler::processInt(CAMBEData& data)
if (m_dcsId == 0x00U) { // && seqNo == 0U) { if (m_dcsId == 0x00U) { // && seqNo == 0U) {
// Write to Header.log if it's enabled // Write to Header.log if it's enabled
if (m_headerLogger != NULL) if (m_headerLogger != NULL)
m_headerLogger->write(wxT("DCS"), header); m_headerLogger->write("DCS", header);
m_dcsId = id; m_dcsId = id;
m_dcsSeq = 0x00U; m_dcsSeq = 0x00U;

20
DStarGatewayThread.cpp
Unescape View File

@ -614,14 +614,14 @@ void CDStarGatewayThread::setCCS(bool enabled, const std::string& host)
wxFileName fileName(wxFileName::GetHomeDir(), CCS_HOSTS_FILE_NAME); wxFileName fileName(wxFileName::GetHomeDir(), CCS_HOSTS_FILE_NAME);
if (!fileName.IsFileReadable()) { if (!fileName.IsFileReadable()) {
CLog::logInfo(wxT("File %s not readable"), fileName.GetFullPath().c_str()); CLog::logInfo("File %s not readable", fileName.GetFullPath().c_str());
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
fileName.Assign(::wxGetCwd(), CCS_HOSTS_FILE_NAME); fileName.Assign(::wxGetCwd(), CCS_HOSTS_FILE_NAME);
#else #else
fileName.Assign(wxT(m_dataDir), CCS_HOSTS_FILE_NAME); fileName.Assign(wxT(m_dataDir), CCS_HOSTS_FILE_NAME);
#endif #endif
if (!fileName.IsFileReadable()) { if (!fileName.IsFileReadable()) {
CLog::logInfo(wxT("File %s not readable"), fileName.GetFullPath().c_str()); CLog::logInfo("File %s not readable", fileName.GetFullPath().c_str());
m_ccsEnabled = false; m_ccsEnabled = false;
return; return;
} }
@ -844,7 +844,7 @@ void CDStarGatewayThread::processRepeater(IRepeaterProtocolHandler* handler)
case RT_HEADER: { case RT_HEADER: {
CHeaderData* header = handler->readHeader(); CHeaderData* header = handler->readHeader();
if (header != NULL) { if (header != NULL) {
// CLog::logInfo(wxT("Repeater header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X"), header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str(), header->getFlag1(), header->getFlag2(), header->getFlag3()); // CLog::logInfo("Repeater header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X", header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str(), header->getFlag1(), header->getFlag2(), header->getFlag3());
CRepeaterHandler* repeater = CRepeaterHandler::findDVRepeater(*header); CRepeaterHandler* repeater = CRepeaterHandler::findDVRepeater(*header);
if (repeater == NULL) if (repeater == NULL)
@ -872,7 +872,7 @@ void CDStarGatewayThread::processRepeater(IRepeaterProtocolHandler* handler)
case RT_BUSY_HEADER: { case RT_BUSY_HEADER: {
CHeaderData* header = handler->readBusyHeader(); CHeaderData* header = handler->readBusyHeader();
if (header != NULL) { if (header != NULL) {
// CLog::logInfo(wxT("Repeater busy header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X"), header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str(), header->getFlag1(), header->getFlag2(), header->getFlag3()); // CLog::logInfo("Repeater busy header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X", header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str(), header->getFlag1(), header->getFlag2(), header->getFlag3());
CRepeaterHandler* repeater = CRepeaterHandler::findDVRepeater(*header); CRepeaterHandler* repeater = CRepeaterHandler::findDVRepeater(*header);
if (repeater == NULL) if (repeater == NULL)
@ -900,7 +900,7 @@ void CDStarGatewayThread::processRepeater(IRepeaterProtocolHandler* handler)
case RT_DD: { case RT_DD: {
CDDData* data = handler->readDD(); CDDData* data = handler->readDD();
if (data != NULL) { if (data != NULL) {
// CLog::logInfo(wxT("DD header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X"), data->getMyCall1().c_str(), data->getMyCall2().c_str(), data->getYourCall().c_str(), data->getRptCall1().c_str(), data->getRptCall2().c_str(), data->getFlag1(), data->getFlag2(), data->getFlag3()); // CLog::logInfo("DD header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X", data->getMyCall1().c_str(), data->getMyCall2().c_str(), data->getYourCall().c_str(), data->getRptCall1().c_str(), data->getRptCall2().c_str(), data->getFlag1(), data->getFlag2(), data->getFlag3());
CRepeaterHandler* repeater = CRepeaterHandler::findDDRepeater(); CRepeaterHandler* repeater = CRepeaterHandler::findDDRepeater();
if (repeater == NULL) if (repeater == NULL)
@ -946,7 +946,7 @@ void CDStarGatewayThread::processDExtra()
case DE_HEADER: { case DE_HEADER: {
CHeaderData* header = m_dextraPool->readHeader(); CHeaderData* header = m_dextraPool->readHeader();
if (header != NULL) { if (header != NULL) {
// CLog::logInfo(wxT("DExtra header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s"), header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str()); // CLog::logInfo("DExtra header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s", header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str());
CDExtraHandler::process(*header); CDExtraHandler::process(*header);
delete header; delete header;
} }
@ -995,7 +995,7 @@ void CDStarGatewayThread::processDPlus()
case DP_HEADER: { case DP_HEADER: {
CHeaderData* header = m_dplusPool->readHeader(); CHeaderData* header = m_dplusPool->readHeader();
if (header != NULL) { if (header != NULL) {
// CLog::logInfo(wxT("D-Plus header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s"), header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str()); // CLog::logInfo("D-Plus header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s", header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str());
CDPlusHandler::process(*header); CDPlusHandler::process(*header);
delete header; delete header;
} }
@ -1044,7 +1044,7 @@ void CDStarGatewayThread::processDCS()
case DC_DATA: { case DC_DATA: {
CAMBEData* data = m_dcsPool->readData(); CAMBEData* data = m_dcsPool->readData();
if (data != NULL) { if (data != NULL) {
// CLog::logInfo(wxT("DCS header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s"), header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str()); // CLog::logInfo("DCS header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s", header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str());
CDCSHandler::process(*data); CDCSHandler::process(*data);
delete data; delete data;
} }
@ -1066,7 +1066,7 @@ void CDStarGatewayThread::processG2()
case GT_HEADER: { case GT_HEADER: {
CHeaderData* header = m_g2Handler->readHeader(); CHeaderData* header = m_g2Handler->readHeader();
if (header != NULL) { if (header != NULL) {
// CLog::logInfo(wxT("G2 header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X"), header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str(), header->getFlag1(), header->getFlag2(), header->getFlag3()); // CLog::logInfo("G2 header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X", header->getMyCall1().c_str(), header->getMyCall2().c_str(), header->getYourCall().c_str(), header->getRptCall1().c_str(), header->getRptCall2().c_str(), header->getFlag1(), header->getFlag2(), header->getFlag3());
CG2Handler::process(*header); CG2Handler::process(*header);
delete header; delete header;
} }
@ -1095,7 +1095,7 @@ void CDStarGatewayThread::processDD()
if (data == NULL) if (data == NULL)
return; return;
// CLog::logInfo(wxT("DD header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X"), data->getMyCall1().c_str(), data->getMyCall2().c_str(), data->getYourCall().c_str(), data->getRptCall1().c_str(), data->getRptCall2().c_str(), data->getFlag1(), data->getFlag2(), data->getFlag3()); // CLog::logInfo("DD header - My: %s/%s Your: %s Rpt1: %s Rpt2: %s Flags: %02X %02X %02X", data->getMyCall1().c_str(), data->getMyCall2().c_str(), data->getYourCall().c_str(), data->getRptCall1().c_str(), data->getRptCall2().c_str(), data->getFlag1(), data->getFlag2(), data->getFlag3());
delete data; delete data;
} }

4
G2Handler.cpp
Unescape View File

@ -78,7 +78,7 @@ void CG2Handler::process(CHeaderData& header)
unsigned char flag1 = header.getFlag1(); unsigned char flag1 = header.getFlag1();
if (flag1 == 0x01) { if (flag1 == 0x01) {
// Don't check the incoming stream // Don't check the incoming stream
// CLog::logInfo(wxT("G2 busy message received")); // CLog::logInfo("G2 busy message received"));
return; return;
} }
@ -88,7 +88,7 @@ void CG2Handler::process(CHeaderData& header)
if (handler != NULL) { if (handler != NULL) {
// Write to Header.log if it's enabled // Write to Header.log if it's enabled
if (m_headerLogger != NULL) if (m_headerLogger != NULL)
m_headerLogger->write(wxT("StarNet"), header); m_headerLogger->write("StarNet", header);
handler->process(header); handler->process(header);
return; return;

10
HBRepeaterProtocolHandler.cpp
Unescape View File

@ -57,7 +57,7 @@ bool CHBRepeaterProtocolHandler::writeHeader(CHeaderData& header)
unsigned int length = header.getHBRepeaterData(buffer, 50U, true); unsigned int length = header.getHBRepeaterData(buffer, 50U, true);
#if defined(DUMP_TX) #if defined(DUMP_TX)
CUtils::dump(wxT("Sending Header"), buffer, length); CUtils::dump("Sending Header", buffer, length);
return true; return true;
#else #else
return m_socket.write(buffer, length, header.getYourAddress(), header.getYourPort()); return m_socket.write(buffer, length, header.getYourAddress(), header.getYourPort());
@ -70,7 +70,7 @@ bool CHBRepeaterProtocolHandler::writeAMBE(CAMBEData& data)
unsigned int length = data.getHBRepeaterData(buffer, 30U); unsigned int length = data.getHBRepeaterData(buffer, 30U);
#if defined(DUMP_TX) #if defined(DUMP_TX)
CUtils::dump(wxT("Sending Data"), buffer, length); CUtils::dump("Sending Data", buffer, length);
return true; return true;
#else #else
return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort()); return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
@ -83,7 +83,7 @@ bool CHBRepeaterProtocolHandler::writeDD(CDDData& data)
unsigned int length = data.getHBRepeaterData(buffer, 2000U); unsigned int length = data.getHBRepeaterData(buffer, 2000U);
#if defined(DUMP_TX) #if defined(DUMP_TX)
CUtils::dump(wxT("Sending DD Data"), buffer, length); CUtils::dump("Sending DD Data", buffer, length);
return true; return true;
#else #else
return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort()); return m_socket.write(buffer, length, data.getYourAddress(), data.getYourPort());
@ -96,7 +96,7 @@ bool CHBRepeaterProtocolHandler::writeText(CTextData& text)
unsigned int length = text.getHBRepeaterData(buffer, 40U); unsigned int length = text.getHBRepeaterData(buffer, 40U);
#if defined(DUMP_TX) #if defined(DUMP_TX)
CUtils::dump(wxT("Sending Text"), buffer, length); CUtils::dump("Sending Text", buffer, length);
return true; return true;
#else #else
return m_socket.write(buffer, length, text.getAddress(), text.getPort()); return m_socket.write(buffer, length, text.getAddress(), text.getPort());
@ -109,7 +109,7 @@ bool CHBRepeaterProtocolHandler::writeStatus(CStatusData& status)
unsigned int length = status.getHBRepeaterData(buffer, 30U); unsigned int length = status.getHBRepeaterData(buffer, 30U);
#if defined(DUMP_TX) #if defined(DUMP_TX)
CUtils::dump(wxT("Sending Status"), buffer, length); CUtils::dump("Sending Status", buffer, length);
return true; return true;
#else #else
return m_socket.write(buffer, length, status.getAddress(), status.getPort()); return m_socket.write(buffer, length, status.getAddress(), status.getPort());

4
IRCDDBMultiClient.cpp
Unescape View File

@ -287,11 +287,11 @@ bool CIRCDDBMultiClient::receiveUser(std::string & userCallsign, std::string & r
{ {
CIRCDDBMultiClientQuery * item = checkAndGetNextResponse(IDRT_USER, "CIRCDDBMultiClient::receiveUser: unexpected response type"); CIRCDDBMultiClientQuery * item = checkAndGetNextResponse(IDRT_USER, "CIRCDDBMultiClient::receiveUser: unexpected response type");
if (item == NULL) { if (item == NULL) {
//CLog::logInfo(wxT("CIRCDDBMultiClient::receiveUser NO USER IN QUEUE")); //CLog::logInfo("CIRCDDBMultiClient::receiveUser NO USER IN QUEUE"));
return false; return false;
} }
//CLog::logInfo(wxT("CIRCDDBMultiClient::receiveUser : %s"), item->toString()); //CLog::logInfo("CIRCDDBMultiClient::receiveUser : %s", item->toString());
userCallsign = item->getUser(); userCallsign = item->getUser();
repeaterCallsign = item->getRepeater(); repeaterCallsign = item->getRepeater();

6
IRCDDBMultiClient.h
Unescape View File

@ -84,7 +84,7 @@ public:
unsigned int incrementResponseCount() unsigned int incrementResponseCount()
{ {
++m_responseCount; ++m_responseCount;
//wxLogMessage(wxT("Resp Count : %s %d"), toString(), m_responseCount); //wxLogMessage("Resp Count : %s %d"), toString(), m_responseCount);
return m_responseCount; return m_responseCount;
} }
@ -93,7 +93,7 @@ public:
*/ */
void Update(const std::string& user, const std::string& repeater, const std::string& gateway, const std::string& address, const std::string& timestamp) void Update(const std::string& user, const std::string& repeater, const std::string& gateway, const std::string& address, const std::string& timestamp)
{ {
//wxLogMessage(wxT("Before : %s"), toString()); //wxLogMessage("Before : %s"), toString());
if (timestamp.empty() || timestamp.compare(m_timestamp) >= 0) { if (timestamp.empty() || timestamp.compare(m_timestamp) >= 0) {
m_user = user; m_user = user;
m_repeater = repeater; m_repeater = repeater;
@ -103,7 +103,7 @@ public:
if(m_address.empty() && !address.empty()) if(m_address.empty() && !address.empty())
m_address = address; m_address = address;
} }
//wxLogMessage(wxT("After : %s"), toString()); //wxLogMessage("After : %s"), toString());
} }
IRCDDB_RESPONSE_TYPE getType() IRCDDB_RESPONSE_TYPE getType()

32
RemoteProtocolHandler.cpp
Unescape View File

@ -66,7 +66,7 @@ RPH_TYPE CRemoteProtocolHandler::readType()
if (length <= 0) if (length <= 0)
return m_type; return m_type;
// CUtils::dump(wxT("Incoming"), m_inBuffer, length); // CUtils::dump("Incoming", m_inBuffer, length);
if (::memcmp(m_inBuffer, "LIN", 3U) == 0) { if (::memcmp(m_inBuffer, "LIN", 3U) == 0) {
m_loggedIn = false; m_loggedIn = false;
@ -86,7 +86,7 @@ RPH_TYPE CRemoteProtocolHandler::readType()
if (m_loggedIn) { if (m_loggedIn) {
if (address.s_addr != m_address.s_addr || port != m_port) { if (address.s_addr != m_address.s_addr || port != m_port) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
} }
@ -95,49 +95,49 @@ RPH_TYPE CRemoteProtocolHandler::readType()
if (::memcmp(m_inBuffer, "SHA", 3U) == 0) { if (::memcmp(m_inBuffer, "SHA", 3U) == 0) {
if (m_loggedIn) { if (m_loggedIn) {
sendNAK(wxT("Someone is already logged in")); sendNAK("Someone is already logged in");
return m_type; return m_type;
} }
m_type = RPHT_HASH; m_type = RPHT_HASH;
return m_type; return m_type;
} else if (::memcmp(m_inBuffer, "GCS", 3U) == 0) { } else if (::memcmp(m_inBuffer, "GCS", 3U) == 0) {
if (!m_loggedIn) { if (!m_loggedIn) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
m_type = RPHT_CALLSIGNS; m_type = RPHT_CALLSIGNS;
return m_type; return m_type;
} else if (::memcmp(m_inBuffer, "GRP", 3U) == 0) { } else if (::memcmp(m_inBuffer, "GRP", 3U) == 0) {
if (!m_loggedIn) { if (!m_loggedIn) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
m_type = RPHT_REPEATER; m_type = RPHT_REPEATER;
return m_type; return m_type;
} else if (::memcmp(m_inBuffer, "GSN", 3U) == 0) { } else if (::memcmp(m_inBuffer, "GSN", 3U) == 0) {
if (!m_loggedIn) { if (!m_loggedIn) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
m_type = RPHT_STARNET; m_type = RPHT_STARNET;
return m_type; return m_type;
} else if (::memcmp(m_inBuffer, "LNK", 3U) == 0) { } else if (::memcmp(m_inBuffer, "LNK", 3U) == 0) {
if (!m_loggedIn) { if (!m_loggedIn) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
m_type = RPHT_LINK; m_type = RPHT_LINK;
return m_type; return m_type;
} else if (::memcmp(m_inBuffer, "UNL", 3U) == 0) { } else if (::memcmp(m_inBuffer, "UNL", 3U) == 0) {
if (!m_loggedIn) { if (!m_loggedIn) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
m_type = RPHT_UNLINK; m_type = RPHT_UNLINK;
return m_type; return m_type;
} else if (::memcmp(m_inBuffer, "LGO", 3U) == 0) { } else if (::memcmp(m_inBuffer, "LGO", 3U) == 0) {
if (!m_loggedIn) { if (!m_loggedIn) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
m_type = RPHT_LOGOFF; m_type = RPHT_LOGOFF;
@ -149,7 +149,7 @@ RPH_TYPE CRemoteProtocolHandler::readType()
return m_type; return m_type;
} else { } else {
if (!m_loggedIn) { if (!m_loggedIn) {
sendNAK(wxT("You are not logged in")); sendNAK("You are not logged in");
return m_type; return m_type;
} }
m_type = RPHT_UNKNOWN; m_type = RPHT_UNKNOWN;
@ -298,7 +298,7 @@ bool CRemoteProtocolHandler::sendCallsigns(const std::vector<std::string> & repe
p += LONG_CALLSIGN_LENGTH; p += LONG_CALLSIGN_LENGTH;
} }
// CUtils::dump(wxT("Outgoing"), m_outBuffer, p - m_outBuffer); // CUtils::dump("Outgoing", m_outBuffer, p - m_outBuffer);
return m_socket.write(m_outBuffer, p - m_outBuffer, m_address, m_port); return m_socket.write(m_outBuffer, p - m_outBuffer, m_address, m_port);
} }
@ -349,7 +349,7 @@ bool CRemoteProtocolHandler::sendRepeater(const CRemoteRepeaterData& data)
p += sizeof(int32_t); p += sizeof(int32_t);
} }
// CUtils::dump(wxT("Outgoing"), m_outBuffer, p - m_outBuffer); // CUtils::dump("Outgoing", m_outBuffer, p - m_outBuffer);
return m_socket.write(m_outBuffer, p - m_outBuffer, m_address, m_port); return m_socket.write(m_outBuffer, p - m_outBuffer, m_address, m_port);
} }
@ -397,7 +397,7 @@ bool CRemoteProtocolHandler::sendStarNetGroup(const CRemoteStarNetGroup& data)
p += sizeof(uint32_t); p += sizeof(uint32_t);
} }
// CUtils::dump(wxT("Outgoing"), m_outBuffer, p - m_outBuffer); // CUtils::dump("Outgoing", m_outBuffer, p - m_outBuffer);
return m_socket.write(m_outBuffer, p - m_outBuffer, m_address, m_port); return m_socket.write(m_outBuffer, p - m_outBuffer, m_address, m_port);
} }
@ -417,7 +417,7 @@ bool CRemoteProtocolHandler::sendACK()
{ {
::memcpy(m_outBuffer + 0U, "ACK", 3U); ::memcpy(m_outBuffer + 0U, "ACK", 3U);
// CUtils::dump(wxT("Outgoing"), m_outBuffer, 3U); // CUtils::dump("Outgoing", m_outBuffer, 3U);
return m_socket.write(m_outBuffer, 3U, m_address, m_port); return m_socket.write(m_outBuffer, 3U, m_address, m_port);
} }
@ -431,7 +431,7 @@ bool CRemoteProtocolHandler::sendNAK(const std::string& text)
for (unsigned int i = 0U; i < text.length(); i++) for (unsigned int i = 0U; i < text.length(); i++)
m_outBuffer[i + 3U] = text[i]; m_outBuffer[i + 3U] = text[i];
// CUtils::dump(wxT("Outgoing"), m_outBuffer, 3U + text.length() + 1U); // CUtils::dump("Outgoing", m_outBuffer, 3U + text.length() + 1U);
return m_socket.write(m_outBuffer, 3U + text.length() + 1U, m_address, m_port); return m_socket.write(m_outBuffer, 3U + text.length() + 1U, m_address, m_port);
} }
@ -443,7 +443,7 @@ bool CRemoteProtocolHandler::sendRandom(uint32_t random)
uint32_t temp = CUtils::swap_endian(random); uint32_t temp = CUtils::swap_endian(random);
::memcpy(m_outBuffer + 3U, &temp, sizeof(uint32_t)); ::memcpy(m_outBuffer + 3U, &temp, sizeof(uint32_t));
// CUtils::dump(wxT("Outgoing"), m_outBuffer, 3U + sizeof(uint32_t)); // CUtils::dump("Outgoing", m_outBuffer, 3U + sizeof(uint32_t));
return m_socket.write(m_outBuffer, 3U + sizeof(uint32_t), m_address, m_port); return m_socket.write(m_outBuffer, 3U + sizeof(uint32_t), m_address, m_port);
} }

274
RepeaterHandler.cpp
Unescape View File

@ -211,16 +211,16 @@ m_heardTimer(1000U, 0U, 100U) // 100ms
#ifdef USE_ANNOUNCE #ifdef USE_ANNOUNCE
wxFileName messageFile; wxFileName messageFile;
messageFile.SetPath(::wxGetHomeDir()); messageFile.SetPath(::wxGetHomeDir());
messageFile.SetName(wxT("message")); messageFile.SetName("message"));
messageFile.SetExt(wxT("dvtool")); messageFile.SetExt("dvtool"));
wxFileName weatherFile; wxFileName weatherFile;
weatherFile.SetPath(::wxGetHomeDir()); weatherFile.SetPath(::wxGetHomeDir());
weatherFile.SetName(wxT("weather")); weatherFile.SetName("weather"));
weatherFile.SetExt(wxT("dvtool")); weatherFile.SetExt("dvtool"));
m_msgAudio = new CAnnouncementUnit(this, callsign, messageFile.GetFullPath(), wxT("MSG")); m_msgAudio = new CAnnouncementUnit(this, callsign, messageFile.GetFullPath(), "MSG"));
m_wxAudio = new CAnnouncementUnit(this, callsign, weatherFile.GetFullPath(), wxT("WX")); m_wxAudio = new CAnnouncementUnit(this, callsign, weatherFile.GetFullPath(), "WX"));
#endif #endif
m_echo = new CEchoUnit(this, callsign); m_echo = new CEchoUnit(this, callsign);
@ -599,7 +599,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
} }
if (!m_heardUser.empty() && m_myCall1 != m_heardUser && m_irc != NULL) if (!m_heardUser.empty() && m_myCall1 != m_heardUser && m_irc != NULL)
m_irc->sendHeard(m_heardUser, wxT(" "), wxT(" "), m_heardRepeater, wxT(" "), 0x00U, 0x00U, 0x00U); m_irc->sendHeard(m_heardUser, " ", " ", m_heardRepeater, " ", 0x00U, 0x00U, 0x00U);
#ifdef USE_CCS #ifdef USE_CCS
// Inform CCS // Inform CCS
@ -639,7 +639,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
// Write to Header.log if it's enabled // Write to Header.log if it's enabled
if (m_headerLogger != NULL) if (m_headerLogger != NULL)
m_headerLogger->write(wxT("Repeater"), header); m_headerLogger->write("Repeater", header);
// Reset the DTMF decoder // Reset the DTMF decoder
m_dtmf.reset(); m_dtmf.reset();
@ -683,7 +683,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
} }
// Reject silly RPT2 values // Reject silly RPT2 values
if (m_rptCall2 == (m_rptCallsign) || m_rptCall2 == (wxT(" "))) if (m_rptCall2 == (m_rptCallsign) || m_rptCall2 == (" "))
return; return;
// Do cross-band routing if RPT2 is not one of the gateway callsigns // Do cross-band routing if RPT2 is not one of the gateway callsigns
@ -705,7 +705,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
#ifdef USE_STARNET #ifdef USE_STARNET
m_starNet = CStarNetHandler::findStarNet(header); m_starNet = CStarNetHandler::findStarNet(header);
if (m_starNet != NULL && !m_restricted) { if (m_starNet != NULL && !m_restricted) {
CLog::logInfo(wxT("StarNet routing by %s to %s"), m_myCall1.c_str(), m_yourCall.c_str()); CLog::logInfo("StarNet routing by %s to %s", m_myCall1.c_str(), m_yourCall.c_str());
m_starNet->process(header); m_starNet->process(header);
m_g2Status = G2_STARNET; m_g2Status = G2_STARNET;
return; return;
@ -713,20 +713,20 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
#endif #endif
// Reject simple cases // Reject simple cases
if (m_yourCall.substr(0,4) == (wxT("CQCQ"))) { if (m_yourCall.substr(0,4) == ("CQCQ")) {
sendToOutgoing(header); sendToOutgoing(header);
return; return;
} }
// Handle the Echo command // Handle the Echo command
if (m_echoEnabled && m_yourCall == (wxT(" E"))) { if (m_echoEnabled && m_yourCall == (" E")) {
m_g2Status = G2_ECHO; m_g2Status = G2_ECHO;
m_echo->writeHeader(header); m_echo->writeHeader(header);
return; return;
} }
// Handle the Info command // Handle the Info command
if (m_infoEnabled && m_yourCall == (wxT(" I"))) { if (m_infoEnabled && m_yourCall == (" I")) {
m_g2Status = G2_LOCAL; m_g2Status = G2_LOCAL;
m_infoNeeded = true; m_infoNeeded = true;
return; return;
@ -734,14 +734,14 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
#ifdef USE_ANNOUNCE #ifdef USE_ANNOUNCE
// Handle the MSG command // Handle the MSG command
if (m_infoEnabled && m_yourCall == (wxT(" M"))) { if (m_infoEnabled && m_yourCall == (" M")) {
m_g2Status = G2_LOCAL; m_g2Status = G2_LOCAL;
m_msgNeeded = true; m_msgNeeded = true;
return; return;
} }
// Handle the WX command // Handle the WX command
if (m_infoEnabled && m_yourCall == (wxT(" W"))) { if (m_infoEnabled && m_yourCall == (" W")) {
m_g2Status = G2_LOCAL; m_g2Status = G2_LOCAL;
m_wxNeeded = true; m_wxNeeded = true;
return; return;
@ -749,7 +749,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
#endif #endif
// Handle the Version command // Handle the Version command
if (m_infoEnabled && m_yourCall == (wxT(" V"))) { if (m_infoEnabled && m_yourCall == (" V")) {
m_g2Status = G2_VERSION; m_g2Status = G2_VERSION;
sendToOutgoing(header); sendToOutgoing(header);
return; return;
@ -762,7 +762,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
#ifdef USE_CCS #ifdef USE_CCS
if (isCCSCommand(m_yourCall)) { if (isCCSCommand(m_yourCall)) {
ccsCommandHandler(m_yourCall, m_myCall1, wxT("UR Call")); ccsCommandHandler(m_yourCall, m_myCall1, "UR Call"));
sendToOutgoing(header); sendToOutgoing(header);
} else } else
#endif #endif
@ -770,7 +770,7 @@ void CRepeaterHandler::processRepeater(CHeaderData& header)
g2CommandHandler(m_yourCall, m_myCall1, header); g2CommandHandler(m_yourCall, m_myCall1, header);
if (m_g2Status == G2_NONE) { if (m_g2Status == G2_NONE) {
reflectorCommandHandler(m_yourCall, m_myCall1, wxT("UR Call")); reflectorCommandHandler(m_yourCall, m_myCall1, "UR Call");
sendToOutgoing(header); sendToOutgoing(header);
} }
} }
@ -820,13 +820,13 @@ void CRepeaterHandler::processRepeater(CAMBEData& data)
} }
#ifdef USE_CCS #ifdef USE_CCS
else if (isCCSCommand(command)) { else if (isCCSCommand(command)) {
ccsCommandHandler(command, m_myCall1, wxT("DTMF")); ccsCommandHandler(command, m_myCall1, "DTMF"));
} }
#endif #endif
else if (command == " I") { else if (command == " I") {
m_infoNeeded = true; m_infoNeeded = true;
} else { } else {
reflectorCommandHandler(command, m_myCall1, wxT("DTMF")); reflectorCommandHandler(command, m_myCall1, "DTMF");
} }
} }
} }
@ -1149,7 +1149,7 @@ bool CRepeaterHandler::process(CDDData& data)
{ {
unsigned char* address = data.getDestinationAddress(); unsigned char* address = data.getDestinationAddress();
if (::memcmp(address, ETHERNET_BROADCAST_ADDRESS, ETHERNET_ADDRESS_LENGTH) == 0) if (::memcmp(address, ETHERNET_BROADCAST_ADDRESS, ETHERNET_ADDRESS_LENGTH) == 0)
data.setRepeaters(m_gwyCallsign, wxT(" ")); data.setRepeaters(m_gwyCallsign, " ");
else if (::memcmp(address, TOALL_MULTICAST_ADDRESS, ETHERNET_ADDRESS_LENGTH) == 0) else if (::memcmp(address, TOALL_MULTICAST_ADDRESS, ETHERNET_ADDRESS_LENGTH) == 0)
data.setRepeaters(m_gwyCallsign, m_rptCallsign); data.setRepeaters(m_gwyCallsign, m_rptCallsign);
else if (::memcmp(address, DX_MULTICAST_ADDRESS, ETHERNET_ADDRESS_LENGTH) == 0) else if (::memcmp(address, DX_MULTICAST_ADDRESS, ETHERNET_ADDRESS_LENGTH) == 0)
@ -1160,7 +1160,7 @@ bool CRepeaterHandler::process(CDDData& data)
data.setDestination(m_address, m_port); data.setDestination(m_address, m_port);
data.setFlags(0xC0U, 0x00U, 0x00U); data.setFlags(0xC0U, 0x00U, 0x00U);
data.setMyCall1(m_ddCallsign); data.setMyCall1(m_ddCallsign);
data.setMyCall2(wxT(" ")); data.setMyCall2(" ");
m_repeaterHandler->writeDD(data); m_repeaterHandler->writeDD(data);
@ -1545,7 +1545,7 @@ void CRepeaterHandler::clockInt(unsigned int ms)
#ifdef USE_CCS #ifdef USE_CCS
else if (m_linkStatus == LS_LINKING_CCS) { else if (m_linkStatus == LS_LINKING_CCS) {
// CCS didn't reply in time // CCS didn't reply in time
CLog::logInfo(wxT("CCS did not reply within five seconds")); CLog::logInfo("CCS did not reply within five seconds"));
m_ccsHandler->stopLink(); m_ccsHandler->stopLink();
@ -1842,7 +1842,7 @@ void CRepeaterHandler::link(RECONNECT reconnect, const std::string& reflector)
#ifdef USE_CCS #ifdef USE_CCS
// CCS removal // CCS removal
if (m_linkStatus == LS_LINKING_CCS || m_linkStatus == LS_LINKED_CCS) { if (m_linkStatus == LS_LINKING_CCS || m_linkStatus == LS_LINKED_CCS) {
CLog::logInfo(wxT("Dropping CCS link to %s"), m_linkRepeater.c_str()); CLog::logInfo("Dropping CCS link to %s", m_linkRepeater.c_str());
m_ccsHandler->stopLink(); m_ccsHandler->stopLink();
@ -2051,7 +2051,7 @@ void CRepeaterHandler::g2CommandHandler(const std::string& callsign, const std::
CLog::logInfo("%s is trying to G2 route to repeater %s", user.c_str(), repeater.c_str()); CLog::logInfo("%s is trying to G2 route to repeater %s", user.c_str(), repeater.c_str());
m_g2Repeater = repeater; m_g2Repeater = repeater;
m_g2User = wxT("CQCQCQ "); m_g2User = "CQCQCQ ";
CRepeaterData* data = m_cache->findRepeater(m_g2Repeater); CRepeaterData* data = m_cache->findRepeater(m_g2Repeater);
@ -2118,7 +2118,7 @@ void CRepeaterHandler::g2CommandHandler(const std::string& callsign, const std::
#ifdef USE_CCS #ifdef USE_CCS
void CRepeaterHandler::ccsCommandHandler(const std::string& callsign, const std::string& user, const std::string& type) void CRepeaterHandler::ccsCommandHandler(const std::string& callsign, const std::string& user, const std::string& type)
{ {
if (callsign.IsSameAs(wxT("CA "))) { if (callsign.IsSameAs("CA "))) {
m_ccsHandler->stopLink(user, type); m_ccsHandler->stopLink(user, type);
} else { } else {
CCS_STATUS status = m_ccsHandler->getStatus(); CCS_STATUS status = m_ccsHandler->getStatus();
@ -2523,38 +2523,38 @@ void CRepeaterHandler::writeLinkingTo(const std::string &callsign)
switch (m_language) { switch (m_language) {
case TL_DEUTSCH: case TL_DEUTSCH:
text = CStringUtils::string_format(wxT("Verbinde mit %s"), callsign.c_str()); text = CStringUtils::string_format("Verbinde mit %s", callsign.c_str());
break; break;
case TL_DANSK: case TL_DANSK:
text = CStringUtils::string_format(wxT("Linker til %s"), callsign.c_str()); text = CStringUtils::string_format("Linker til %s", callsign.c_str());
break; break;
case TL_FRANCAIS: case TL_FRANCAIS:
text = CStringUtils::string_format(wxT("Connexion a %s"), callsign.c_str()); text = CStringUtils::string_format("Connexion a %s", callsign.c_str());
break; break;
case TL_ITALIANO: case TL_ITALIANO:
text = CStringUtils::string_format(wxT("In conn con %s"), callsign.c_str()); text = CStringUtils::string_format("In conn con %s", callsign.c_str());
break; break;
case TL_POLSKI: case TL_POLSKI:
text = CStringUtils::string_format(wxT("Linkuje do %s"), callsign.c_str()); text = CStringUtils::string_format("Linkuje do %s", callsign.c_str());
break; break;
case TL_ESPANOL: case TL_ESPANOL:
text = CStringUtils::string_format(wxT("Enlazando %s"), callsign.c_str()); text = CStringUtils::string_format("Enlazando %s", callsign.c_str());
break; break;
case TL_SVENSKA: case TL_SVENSKA:
text = CStringUtils::string_format(wxT("Lankar till %s"), callsign.c_str()); text = CStringUtils::string_format("Lankar till %s", callsign.c_str());
break; break;
case TL_NEDERLANDS_NL: case TL_NEDERLANDS_NL:
case TL_NEDERLANDS_BE: case TL_NEDERLANDS_BE:
text = CStringUtils::string_format(wxT("Linken naar %s"), callsign.c_str()); text = CStringUtils::string_format("Linken naar %s", callsign.c_str());
break; break;
case TL_NORSK: case TL_NORSK:
text = CStringUtils::string_format(wxT("Kobler til %s"), callsign.c_str()); text = CStringUtils::string_format("Kobler til %s", callsign.c_str());
break; break;
case TL_PORTUGUES: case TL_PORTUGUES:
text = CStringUtils::string_format(wxT("Conectando, %s"), callsign.c_str()); text = CStringUtils::string_format("Conectando, %s", callsign.c_str());
break; break;
default: default:
text = CStringUtils::string_format(wxT("Linking to %s"), callsign.c_str()); text = CStringUtils::string_format("Linking to %s", callsign.c_str());
break; break;
} }
@ -2575,38 +2575,38 @@ void CRepeaterHandler::writeLinkedTo(const std::string &callsign)
switch (m_language) { switch (m_language) {
case TL_DEUTSCH: case TL_DEUTSCH:
text = CStringUtils::string_format(wxT("Verlinkt zu %s"), callsign.c_str()); text = CStringUtils::string_format("Verlinkt zu %s", callsign.c_str());
break; break;
case TL_DANSK: case TL_DANSK:
text = CStringUtils::string_format(wxT("Linket til %s"), callsign.c_str()); text = CStringUtils::string_format("Linket til %s", callsign.c_str());
break; break;
case TL_FRANCAIS: case TL_FRANCAIS:
text = CStringUtils::string_format(wxT("Connecte a %s"), callsign.c_str()); text = CStringUtils::string_format("Connecte a %s", callsign.c_str());
break; break;
case TL_ITALIANO: case TL_ITALIANO:
text = CStringUtils::string_format(wxT("Connesso a %s"), callsign.c_str()); text = CStringUtils::string_format("Connesso a %s", callsign.c_str());
break; break;
case TL_POLSKI: case TL_POLSKI:
text = CStringUtils::string_format(wxT("Polaczony z %s"), callsign.c_str()); text = CStringUtils::string_format("Polaczony z %s", callsign.c_str());
break; break;
case TL_ESPANOL: case TL_ESPANOL:
text = CStringUtils::string_format(wxT("Enlazado %s"), callsign.c_str()); text = CStringUtils::string_format("Enlazado %s", callsign.c_str());
break; break;
case TL_SVENSKA: case TL_SVENSKA:
text = CStringUtils::string_format(wxT("Lankad till %s"), callsign.c_str()); text = CStringUtils::string_format("Lankad till %s", callsign.c_str());
break; break;
case TL_NEDERLANDS_NL: case TL_NEDERLANDS_NL:
case TL_NEDERLANDS_BE: case TL_NEDERLANDS_BE:
text = CStringUtils::string_format(wxT("Gelinkt met %s"), callsign.c_str()); text = CStringUtils::string_format("Gelinkt met %s", callsign.c_str());
break; break;
case TL_NORSK: case TL_NORSK:
text = CStringUtils::string_format(wxT("Tilkoblet %s"), callsign.c_str()); text = CStringUtils::string_format("Tilkoblet %s", callsign.c_str());
break; break;
case TL_PORTUGUES: case TL_PORTUGUES:
text = CStringUtils::string_format(wxT("Conectado a %s"), callsign.c_str()); text = CStringUtils::string_format("Conectado a %s", callsign.c_str());
break; break;
default: default:
text = CStringUtils::string_format(wxT("Linked to %s"), callsign.c_str()); text = CStringUtils::string_format("Linked to %s", callsign.c_str());
break; break;
} }
@ -2627,38 +2627,38 @@ void CRepeaterHandler::writeNotLinked()
switch (m_language) { switch (m_language) {
case TL_DEUTSCH: case TL_DEUTSCH:
text = wxT("Nicht verbunden"); text = "Nicht verbunden";
break; break;
case TL_DANSK: case TL_DANSK:
text = wxT("Ikke forbundet"); text = "Ikke forbundet";
break; break;
case TL_FRANCAIS: case TL_FRANCAIS:
text = wxT("Non connecte"); text = "Non connecte";
break; break;
case TL_ITALIANO: case TL_ITALIANO:
text = wxT("Non connesso"); text = "Non connesso";
break; break;
case TL_POLSKI: case TL_POLSKI:
text = wxT("Nie polaczony"); text = "Nie polaczony";
break; break;
case TL_ESPANOL: case TL_ESPANOL:
text = wxT("No enlazado"); text = "No enlazado";
break; break;
case TL_SVENSKA: case TL_SVENSKA:
text = wxT("Ej lankad"); text = "Ej lankad";
break; break;
case TL_NEDERLANDS_NL: case TL_NEDERLANDS_NL:
case TL_NEDERLANDS_BE: case TL_NEDERLANDS_BE:
text = wxT("Niet gelinkt"); text = "Niet gelinkt";
break; break;
case TL_NORSK: case TL_NORSK:
text = wxT("Ikke linket"); text = "Ikke linket";
break; break;
case TL_PORTUGUES: case TL_PORTUGUES:
text = wxT("Desconectado"); text = "Desconectado";
break; break;
default: default:
text = wxT("Not linked"); text = "Not linked";
break; break;
} }
@ -2680,49 +2680,49 @@ void CRepeaterHandler::writeIsBusy(const std::string& callsign)
switch (m_language) { switch (m_language) {
case TL_DEUTSCH: case TL_DEUTSCH:
text = wxT("Nicht verbunden"); text = "Nicht verbunden";
tempText = CStringUtils::string_format(wxT("%s ist belegt"), callsign.c_str()); tempText = CStringUtils::string_format("%s ist belegt", callsign.c_str());
break; break;
case TL_DANSK: case TL_DANSK:
text = wxT("Ikke forbundet"); text = "Ikke forbundet";
tempText = CStringUtils::string_format(wxT("Optaget fra %s"), callsign.c_str()); tempText = CStringUtils::string_format("Optaget fra %s", callsign.c_str());
break; break;
case TL_FRANCAIS: case TL_FRANCAIS:
text = wxT("Non connecte"); text = "Non connecte";
tempText = CStringUtils::string_format(wxT("Occupe par %s"), callsign.c_str()); tempText = CStringUtils::string_format("Occupe par %s", callsign.c_str());
break; break;
case TL_ITALIANO: case TL_ITALIANO:
text = wxT("Non connesso"); text = "Non connesso";
tempText = CStringUtils::string_format(wxT("Occupado da%s"), callsign.c_str()); tempText = CStringUtils::string_format("Occupado da%s", callsign.c_str());
break; break;
case TL_POLSKI: case TL_POLSKI:
text = wxT("Nie polaczony"); text = "Nie polaczony";
tempText = CStringUtils::string_format(wxT("%s jest zajety"), callsign.c_str()); tempText = CStringUtils::string_format("%s jest zajety", callsign.c_str());
break; break;
case TL_ESPANOL: case TL_ESPANOL:
text = wxT("No enlazado"); text = "No enlazado";
tempText = CStringUtils::string_format(wxT("%s ocupado"), callsign.c_str()); tempText = CStringUtils::string_format("%s ocupado", callsign.c_str());
break; break;
case TL_SVENSKA: case TL_SVENSKA:
text = wxT("Ej lankad"); text = "Ej lankad";
tempText = CStringUtils::string_format(wxT("%s ar upptagen"), callsign.c_str()); tempText = CStringUtils::string_format("%s ar upptagen", callsign.c_str());
break; break;
case TL_NEDERLANDS_NL: case TL_NEDERLANDS_NL:
case TL_NEDERLANDS_BE: case TL_NEDERLANDS_BE:
text = wxT("Niet gelinkt"); text = "Niet gelinkt";
tempText = CStringUtils::string_format(wxT("%s is bezet"), callsign.c_str()); tempText = CStringUtils::string_format("%s is bezet", callsign.c_str());
break; break;
case TL_NORSK: case TL_NORSK:
text = wxT("Ikke linket"); text = "Ikke linket";
tempText = CStringUtils::string_format(wxT("%s er opptatt"), callsign.c_str()); tempText = CStringUtils::string_format("%s er opptatt", callsign.c_str());
break; break;
case TL_PORTUGUES: case TL_PORTUGUES:
text = wxT("Desconectado"); text = "Desconectado";
tempText = CStringUtils::string_format(wxT("%s, ocupado"), callsign.c_str()); tempText = CStringUtils::string_format("%s, ocupado", callsign.c_str());
break; break;
default: default:
text = wxT("Not linked"); text = "Not linked";
tempText = CStringUtils::string_format(wxT("%s is busy"), callsign.c_str()); tempText = CStringUtils::string_format("%s is busy", callsign.c_str());
break; break;
} }
@ -2747,38 +2747,38 @@ void CRepeaterHandler::ccsLinkMade(const std::string& callsign, DIRECTION direct
switch (m_language) { switch (m_language) {
case TL_DEUTSCH: case TL_DEUTSCH:
text = CStringUtils::string_format(wxT("Verlinkt zu %s"), callsign.c_str()); text = CStringUtils::string_format("Verlinkt zu %s", callsign.c_str());
break; break;
case TL_DANSK: case TL_DANSK:
text = CStringUtils::string_format(wxT("Linket til %s"), callsign.c_str()); text = CStringUtils::string_format("Linket til %s", callsign.c_str());
break; break;
case TL_FRANCAIS: case TL_FRANCAIS:
text = CStringUtils::string_format(wxT("Connecte a %s"), callsign.c_str()); text = CStringUtils::string_format("Connecte a %s", callsign.c_str());
break; break;
case TL_ITALIANO: case TL_ITALIANO:
text = CStringUtils::string_format(wxT("Connesso a %s"), callsign.c_str()); text = CStringUtils::string_format("Connesso a %s", callsign.c_str());
break; break;
case TL_POLSKI: case TL_POLSKI:
text = CStringUtils::string_format(wxT("Polaczony z %s"), callsign.c_str()); text = CStringUtils::string_format("Polaczony z %s", callsign.c_str());
break; break;
case TL_ESPANOL: case TL_ESPANOL:
text = CStringUtils::string_format(wxT("Enlazado %s"), callsign.c_str()); text = CStringUtils::string_format("Enlazado %s", callsign.c_str());
break; break;
case TL_SVENSKA: case TL_SVENSKA:
text = CStringUtils::string_format(wxT("Lankad till %s"), callsign.c_str()); text = CStringUtils::string_format("Lankad till %s", callsign.c_str());
break; break;
case TL_NEDERLANDS_NL: case TL_NEDERLANDS_NL:
case TL_NEDERLANDS_BE: case TL_NEDERLANDS_BE:
text = CStringUtils::string_format(wxT("Gelinkt met %s"), callsign.c_str()); text = CStringUtils::string_format("Gelinkt met %s", callsign.c_str());
break; break;
case TL_NORSK: case TL_NORSK:
text = CStringUtils::string_format(wxT("Tilkoblet %s"), callsign.c_str()); text = CStringUtils::string_format("Tilkoblet %s", callsign.c_str());
break; break;
case TL_PORTUGUES: case TL_PORTUGUES:
text = CStringUtils::string_format(wxT("Conectado a %s"), callsign.c_str()); text = CStringUtils::string_format("Conectado a %s", callsign.c_str());
break; break;
default: default:
text = CStringUtils::string_format(wxT("Linked to %s"), callsign.c_str()); text = CStringUtils::string_format("Linked to %s", callsign.c_str());
break; break;
} }
@ -2810,49 +2810,49 @@ void CRepeaterHandler::ccsLinkEnded(const std::string&, DIRECTION direction)
switch (m_language) { switch (m_language) {
case TL_DEUTSCH: case TL_DEUTSCH:
text = wxT("Nicht verbunden"); text = "Nicht verbunden";
tempText = wxT("CCS ist beendet"); tempText = "CCS ist beendet";
break; break;
case TL_DANSK: case TL_DANSK:
text = wxT("Ikke forbundet"); text = "Ikke forbundet";
tempText = wxT("CCS er afsluttet"); tempText = "CCS er afsluttet";
break; break;
case TL_FRANCAIS: case TL_FRANCAIS:
text = wxT("Non connecte"); text = "Non connecte";
tempText = wxT("CCS a pris fin"); tempText = "CCS a pris fin";
break; break;
case TL_ITALIANO: case TL_ITALIANO:
text = wxT("Non connesso"); text = "Non connesso";
tempText = wxT("CCS e finita"); tempText = "CCS e finita";
break; break;
case TL_POLSKI: case TL_POLSKI:
text = wxT("Nie polaczony"); text = "Nie polaczony";
tempText = wxT("CCS zakonczyl"); tempText = "CCS zakonczyl";
break; break;
case TL_ESPANOL: case TL_ESPANOL:
text = wxT("No enlazado"); text = "No enlazado";
tempText = wxT("CCS ha terminado"); tempText = "CCS ha terminado";
break; break;
case TL_SVENSKA: case TL_SVENSKA:
text = wxT("Ej lankad"); text = "Ej lankad";
tempText = wxT("CCS har upphort"); tempText = "CCS har upphort";
break; break;
case TL_NEDERLANDS_NL: case TL_NEDERLANDS_NL:
case TL_NEDERLANDS_BE: case TL_NEDERLANDS_BE:
text = wxT("Niet gelinkt"); text = "Niet gelinkt";
tempText = wxT("CCS is afgelopen"); tempText = "CCS is afgelopen";
break; break;
case TL_NORSK: case TL_NORSK:
text = wxT("Ikke linket"); text = "Ikke linket";
tempText = wxT("CCS er avsluttet"); tempText = "CCS er avsluttet";
break; break;
case TL_PORTUGUES: case TL_PORTUGUES:
text = wxT("Desconectado"); text = "Desconectado";
tempText = wxT("CCS terminou"); tempText = "CCS terminou";
break; break;
default: default:
text = wxT("Not linked"); text = "Not linked";
tempText = wxT("CCS has ended"); tempText = "CCS has ended";
break; break;
} }
@ -2889,49 +2889,49 @@ void CRepeaterHandler::ccsLinkFailed(const std::string& dtmf, DIRECTION directio
switch (m_language) { switch (m_language) {
case TL_DEUTSCH: case TL_DEUTSCH:
text = wxT("Nicht verbunden"); text = "Nicht verbunden";
tempText = CStringUtils::string_format(wxT("%s unbekannt"), dtmf.c_str()); tempText = CStringUtils::string_format("%s unbekannt", dtmf.c_str());
break; break;
case TL_DANSK: case TL_DANSK:
text = wxT("Ikke forbundet"); text = "Ikke forbundet";
tempText = CStringUtils::string_format(wxT("%s unknown"), dtmf.c_str()); tempText = CStringUtils::string_format("%s unknown", dtmf.c_str());
break; break;
case TL_FRANCAIS: case TL_FRANCAIS:
text = wxT("Non connecte"); text = "Non connecte";
tempText = CStringUtils::string_format(wxT("%s inconnu"), dtmf.c_str()); tempText = CStringUtils::string_format("%s inconnu", dtmf.c_str());
break; break;
case TL_ITALIANO: case TL_ITALIANO:
text = wxT("Non connesso"); text = "Non connesso";
tempText = CStringUtils::string_format(wxT("Sconosciuto %s"), dtmf.c_str()); tempText = CStringUtils::string_format("Sconosciuto %s", dtmf.c_str());
break; break;
case TL_POLSKI: case TL_POLSKI:
text = wxT("Nie polaczony"); text = "Nie polaczony";
tempText = CStringUtils::string_format(wxT("%s nieznany"), dtmf.c_str()); tempText = CStringUtils::string_format("%s nieznany", dtmf.c_str());
break; break;
case TL_ESPANOL: case TL_ESPANOL:
text = wxT("No enlazado"); text = "No enlazado";
tempText = CStringUtils::string_format(wxT("Desconocido %s"), dtmf.c_str()); tempText = CStringUtils::string_format("Desconocido %s", dtmf.c_str());
break; break;
case TL_SVENSKA: case TL_SVENSKA:
text = wxT("Ej lankad"); text = "Ej lankad";
tempText = CStringUtils::string_format(wxT("%s okand"), dtmf.c_str()); tempText = CStringUtils::string_format("%s okand", dtmf.c_str());
break; break;
case TL_NEDERLANDS_NL: case TL_NEDERLANDS_NL:
case TL_NEDERLANDS_BE: case TL_NEDERLANDS_BE:
text = wxT("Niet gelinkt"); text = "Niet gelinkt";
tempText = CStringUtils::string_format(wxT("%s bekend"), dtmf.c_str()); tempText = CStringUtils::string_format("%s bekend", dtmf.c_str());
break; break;
case TL_NORSK: case TL_NORSK:
text = wxT("Ikke linket"); text = "Ikke linket";
tempText = CStringUtils::string_format(wxT("%s ukjent"), dtmf.c_str()); tempText = CStringUtils::string_format("%s ukjent", dtmf.c_str());
break; break;
case TL_PORTUGUES: case TL_PORTUGUES:
text = wxT("Desconectado"); text = "Desconectado";
tempText = CStringUtils::string_format(wxT("%s desconhecido"), dtmf.c_str()); tempText = CStringUtils::string_format("%s desconhecido", dtmf.c_str());
break; break;
default: default:
text = wxT("Not linked"); text = "Not linked";
tempText = CStringUtils::string_format(wxT("%s unknown"), dtmf.c_str()); tempText = CStringUtils::string_format("%s unknown", dtmf.c_str());
break; break;
} }
@ -3061,7 +3061,7 @@ void CRepeaterHandler::triggerInfo()
#ifdef USE_CCS #ifdef USE_CCS
bool CRepeaterHandler::isCCSCommand(const std::string& command) const bool CRepeaterHandler::isCCSCommand(const std::string& command) const
{ {
if (command.IsSameAs(wxT("CA "))) if (command.IsSameAs("CA ")))
return true; return true;
wxChar c = command.GetChar(0U); wxChar c = command.GetChar(0U);

1
StringUtils.h
Unescape View File

@ -24,7 +24,6 @@
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#define wxT(x) std::string(x)
#define string_right(s,l) (s.substr(s.length() - l, l)) #define string_right(s,l) (s.substr(s.length() - l, l))
class CStringUtils { class CStringUtils {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.