VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-25 05:25:27 -04:00
Code Issues Projects Releases Wiki Activity

SDRdaemon plugin: use internal (slower) timer for Windows release only

Browse Source
This commit is contained in:
Edouard Griffiths 2016-03-16 18:46:16 +01:00
parent 8a44f5c089
commit be13c80e73
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/sdrdaemon/sdrdaemon.pro
View File

@ -35,3 +35,5 @@ LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../lz4/$${build_subdir} -llz4 LIBS += -L../../../lz4/$${build_subdir} -llz4
RESOURCES = ../../../sdrbase/resources/res.qrc RESOURCES = ../../../sdrbase/resources/res.qrc
CONFIG(MINGW32):DEFINES += USE_INTERNAL_TIMER=1

21
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp
View File

@ -23,8 +23,6 @@
#include "sdrdaemonudphandler.h" #include "sdrdaemonudphandler.h"
#include "sdrdaemoninput.h" #include "sdrdaemoninput.h"
const int SDRdaemonUDPHandler::m_rateDivider = 1000/SDRDAEMON_THROTTLE_MS;
SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI) : SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleFifo *sampleFifo, MessageQueue *outputMessageQueueToGUI) :
m_sdrDaemonBuffer(m_rateDivider), m_sdrDaemonBuffer(m_rateDivider),
m_dataSocket(0), m_dataSocket(0),
@ -45,7 +43,8 @@ SDRdaemonUDPHandler::SDRdaemonUDPHandler(SampleFifo *sampleFifo, MessageQueue *o
m_throttlems(SDRDAEMON_THROTTLE_MS), m_throttlems(SDRDAEMON_THROTTLE_MS),
m_readLengthSamples(0), m_readLengthSamples(0),
m_readLength(0), m_readLength(0),
m_throttleToggle(false) m_throttleToggle(false),
m_rateDivider(1000/SDRDAEMON_THROTTLE_MS)
{ {
m_udpBuf = new char[SDRdaemonBuffer::m_udpPayloadSize]; m_udpBuf = new char[SDRdaemonBuffer::m_udpPayloadSize];
} }
@ -54,6 +53,11 @@ SDRdaemonUDPHandler::~SDRdaemonUDPHandler()
{ {
stop(); stop();
delete[] m_udpBuf; delete[] m_udpBuf;
#ifdef USE_INTERNAL_TIMER
if (m_timer) {
delete m_timer;
}
#endif
} }
void SDRdaemonUDPHandler::start() void SDRdaemonUDPHandler::start()
@ -192,9 +196,16 @@ void SDRdaemonUDPHandler::setSamplerate(uint32_t samplerate)
void SDRdaemonUDPHandler::connectTimer(const QTimer* timer) void SDRdaemonUDPHandler::connectTimer(const QTimer* timer)
{ {
qDebug() << "SDRdaemonUDPHandler::connectTimer"; qDebug() << "SDRdaemonUDPHandler::connectTimer";
#ifdef USE_INTERNAL_TIMER
#warning "Uses internal timer"
m_timer = new QTimer();
m_timer->start(100);
#else
m_timer = timer; m_timer = timer;
m_throttlems = timer->interval(); #endif
connect(timer, SIGNAL(timeout()), this, SLOT(tick())); m_throttlems = m_timer->interval();
m_rateDivider = 1000 / m_throttlems;
connect(m_timer, SIGNAL(timeout()), this, SLOT(tick()));
} }
void SDRdaemonUDPHandler::tick() void SDRdaemonUDPHandler::tick()

5
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h
View File

@ -61,15 +61,14 @@ private:
MessageQueue *m_outputMessageQueueToGUI; MessageQueue *m_outputMessageQueueToGUI;
uint32_t m_tickCount; uint32_t m_tickCount;
std::size_t m_samplesCount; std::size_t m_samplesCount;
const QTimer *m_timer; QTimer *m_timer;
QElapsedTimer m_elapsedTimer; QElapsedTimer m_elapsedTimer;
int m_throttlems; int m_throttlems;
uint32_t m_readLengthSamples; uint32_t m_readLengthSamples;
uint32_t m_readLength; uint32_t m_readLength;
bool m_throttleToggle; bool m_throttleToggle;
int m_rateDivider;
static const int m_rateDivider;
void setSamplerate(uint32_t samplerate); void setSamplerate(uint32_t samplerate);
void processData(); void processData();