diff --git a/main.cpp b/main.cpp index 8ac4742..b99a244 100644 --- a/main.cpp +++ b/main.cpp @@ -103,7 +103,6 @@ int main(int argc, char *argv[]) return a.exec(); - qInfo(logSystem()) << "wfview is finished"; } diff --git a/resampler/resample.c b/resampler/resample.c index 6c58f9f..3d157aa 100644 --- a/resampler/resample.c +++ b/resampler/resample.c @@ -928,7 +928,7 @@ EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t cha EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t channel_index, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len) #endif { - int j; + unsigned int j; spx_uint32_t ilen = *in_len; spx_uint32_t olen = *out_len; spx_word16_t *x = st->mem + channel_index * st->mem_alloc_size; @@ -969,7 +969,7 @@ EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t c EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len) #endif { - int j; + unsigned int j; const int istride_save = st->in_stride; const int ostride_save = st->out_stride; spx_uint32_t ilen = *in_len; diff --git a/resampler/resample_sse.h b/resampler/resample_sse.h index a0c7a20..632bb48 100644 --- a/resampler/resample_sse.h +++ b/resampler/resample_sse.h @@ -39,7 +39,7 @@ #define OVERRIDE_INNER_PRODUCT_SINGLE static inline float inner_product_single(const float *a, const float *b, unsigned int len) { - int i; + unsigned int i; float ret; __m128 sum = _mm_setzero_ps(); for (i=0;icivAddr << " hex: " << hex << this->civAddr; + qDebug(logRig()) << "Using incomingCIVAddr: (int): " << this->civAddr << " Qt::hex: " << Qt::hex << this->civAddr; emit discoveredRigID(rigCaps); } else { emit haveRigID(rigCaps); diff --git a/udphandler.cpp b/udphandler.cpp index 5a9a283..96d19b0 100644 --- a/udphandler.cpp +++ b/udphandler.cpp @@ -1040,7 +1040,7 @@ void udpBase::dataReceived(QByteArray r) return s.seqNum == cs; }); if (match == txSeqBuf.end()) { - qDebug(logUdp()) << this->metaObject()->className() << ": Requested packet " << hex << seq << " not found"; + qDebug(logUdp()) << this->metaObject()->className() << ": Requested packet " << Qt::hex << seq << " not found"; // Just send idle packet. sendControl(false, 0, match->seqNum); } @@ -1067,7 +1067,7 @@ void udpBase::dataReceived(QByteArray r) std::sort(rxSeqBuf.begin(), rxSeqBuf.end()); if (in->seq < rxSeqBuf.front()) { - qDebug(logUdp()) << this->metaObject()->className() << ": ******* seq number may have rolled over ****** previous highest: " << hex << rxSeqBuf.back() << " current: " << hex << in->seq; + qDebug(logUdp()) << this->metaObject()->className() << ": ******* seq number may have rolled over ****** previous highest: " << Qt::hex << rxSeqBuf.back() << " current: " << Qt::hex << in->seq; // Looks like it has rolled over so clear buffer and start again. rxSeqBuf.clear(); @@ -1082,7 +1082,7 @@ void udpBase::dataReceived(QByteArray r) auto s = std::find_if(rxMissing.begin(), rxMissing.end(), [&cs = in->seq](SEQBUFENTRY& s) { return s.seqNum == cs; }); if (s != rxMissing.end()) { - qDebug(logUdp()) << this->metaObject()->className() << ": Missing SEQ has been received! " << hex << in->seq; + qDebug(logUdp()) << this->metaObject()->className() << ": Missing SEQ has been received! " << Qt::hex << in->seq; s = rxMissing.erase(s); } } @@ -1168,7 +1168,7 @@ void udpBase::sendRetransmitRequest() if (missingSeqs.length() == 4) // This is just a single missing packet so send using a control. { p.seq = (missingSeqs[0] & 0xff) | (quint16)(missingSeqs[1] << 8); - qDebug(logUdp()) << this->metaObject()->className() << ": sending request for missing packet : " << hex << p.seq; + qDebug(logUdp()) << this->metaObject()->className() << ": sending request for missing packet : " << Qt::hex << p.seq; QMutexLocker udplocker(&udpMutex); udp->writeDatagram(QByteArray::fromRawData((const char*)p.packet, sizeof(p)), radioIP, port); } diff --git a/udpserver.cpp b/udpserver.cpp index 7b65f2f..c2b7b9f 100644 --- a/udpserver.cpp +++ b/udpserver.cpp @@ -584,7 +584,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) // Found matching entry? // Don't constantly retransmit the same packet, give-up eventually QMutexLocker locker(&mutex); - qDebug(logUdpServer()) << this->metaObject()->className() << ": Sending retransmit of " << hex << match->seqNum; + qDebug(logUdpServer()) << this->metaObject()->className() << ": Sending retransmit of " << Qt::hex << match->seqNum; match->retransmitCount++; current->socket->writeDatagram(match->data, current->ipAddress, current->port); } else { @@ -611,7 +611,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) return s.seqNum == cs; }); if (match == current->txSeqBuf.end()) { - qDebug(logUdpServer()) << current->ipAddress.toString() << ":" << current->port << ": Requested packet " << hex << in->seq << " not found"; + qDebug(logUdpServer()) << current->ipAddress.toString() << ":" << current->port << ": Requested packet " << Qt::hex << in->seq << " not found"; // Just send idle packet. sendControl(current, 0, in->seq); } @@ -620,7 +620,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) // Found matching entry? // Send "untracked" as it has already been sent once. QMutexLocker locker(&mutex); - qDebug(logUdpServer()) << current->ipAddress.toString() << ":" << current->port << ": Sending retransmit of " << hex << match->seqNum; + qDebug(logUdpServer()) << current->ipAddress.toString() << ":" << current->port << ": Sending retransmit of " << Qt::hex << match->seqNum; match->retransmitCount++; current->socket->writeDatagram(match->data, current->ipAddress, current->port); match++; @@ -639,7 +639,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) std::sort(current->rxSeqBuf.begin(), current->rxSeqBuf.end()); if (in->seq < current->rxSeqBuf.front()) { - qDebug(logUdpServer()) << current->ipAddress.toString() << ": ******* seq number may have rolled over ****** previous highest: " << hex << current->rxSeqBuf.back() << " current: " << hex << in->seq; + qDebug(logUdpServer()) << current->ipAddress.toString() << ": ******* seq number may have rolled over ****** previous highest: " << Qt::hex << current->rxSeqBuf.back() << " current: " << Qt::hex << in->seq; // Looks like it has rolled over so clear buffer and start again. current->rxSeqBuf.clear(); return; @@ -653,7 +653,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) auto s = std::find_if(current->rxMissing.begin(), current->rxMissing.end(), [&cs = in->seq](SEQBUFENTRY& s) { return s.seqNum == cs; }); if (s != current->rxMissing.end()) { - qDebug(logUdpServer()) << current->ipAddress.toString() << ": Missing SEQ has been received! " << hex << in->seq; + qDebug(logUdpServer()) << current->ipAddress.toString() << ": Missing SEQ has been received! " << Qt::hex << in->seq; s = current->rxMissing.erase(s); } } @@ -1163,7 +1163,7 @@ void udpServer::sendRetransmitRequest(CLIENT *c) if (missingSeqs.length() == 4) // This is just a single missing packet so send using a control. { p.seq = (missingSeqs[0] & 0xff) | (quint16)(missingSeqs[1] << 8); - qDebug(logUdpServer()) << c->ipAddress.toString() << ": sending request for missing packet : " << hex << p.seq; + qDebug(logUdpServer()) << c->ipAddress.toString() << ": sending request for missing packet : " << Qt::hex << p.seq; c->socket->writeDatagram(QByteArray::fromRawData((const char*)p.packet, sizeof(p)), c->ipAddress, c->port); } else diff --git a/wfview.pro b/wfview.pro index c75eecf..b0db4cc 100644 --- a/wfview.pro +++ b/wfview.pro @@ -38,6 +38,8 @@ DEFINES += RANDOM_PREFIX=wf macos:INCLUDEPATH += /usr/local/include macos:LIBS += -L/usr/local/lib +macx:ICON = resources/wfview.icns + !win32:DEFINES += HOST=\\\"`hostname`\\\" UNAME=\\\"`whoami`\\\" !win32:DEFINES += GITSHORT="\\\"$(shell git -C $$PWD rev-parse --short HEAD)\\\""