VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-03 21:20:31 -05:00
Code Issues Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
f4exb 2019-05-22 08:21:09 +02:00
commit c500e6f408
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/samplemimo/testmi/testmithread.cpp
View File

@ -75,6 +75,7 @@ TestMIThread::~TestMIThread()
void TestMIThread::startWork() void TestMIThread::startWork()
{ {
m_timer.setTimerType(Qt::PreciseTimer);
connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick())); connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick()));
m_timer.start(50); m_timer.start(50);
m_startWaitMutex.lock(); m_startWaitMutex.lock();

6
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -60,8 +60,7 @@ FileSourceInput::FileSourceInput(DeviceAPI *deviceAPI) :
m_sampleSize(0), m_sampleSize(0),
m_centerFrequency(0), m_centerFrequency(0),
m_recordLength(0), m_recordLength(0),
m_startingTimeStamp(0), m_startingTimeStamp(0)
m_masterTimer(deviceAPI->getMasterTimer())
{ {
m_deviceAPI->setNbSourceStreams(1); m_deviceAPI->setNbSourceStreams(1);
qDebug("FileSourceInput::FileSourceInput: device source engine: %p", m_deviceAPI->getDeviceSourceEngine()); qDebug("FileSourceInput::FileSourceInput: device source engine: %p", m_deviceAPI->getDeviceSourceEngine());
@ -69,10 +68,13 @@ FileSourceInput::FileSourceInput(DeviceAPI *deviceAPI) :
qDebug("FileSourceInput::FileSourceInput: device source: %p", m_deviceAPI->getDeviceSourceEngine()->getSource()); qDebug("FileSourceInput::FileSourceInput: device source: %p", m_deviceAPI->getDeviceSourceEngine()->getSource());
m_networkManager = new QNetworkAccessManager(); m_networkManager = new QNetworkAccessManager();
connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
m_masterTimer.setTimerType(Qt::PreciseTimer);
m_masterTimer.start(50);
} }
FileSourceInput::~FileSourceInput() FileSourceInput::~FileSourceInput()
{ {
m_masterTimer.stop();
disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*))); disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
delete m_networkManager; delete m_networkManager;

2
plugins/samplesource/filesource/filesourceinput.h
View File

@ -332,7 +332,7 @@ public:
quint64 m_centerFrequency; quint64 m_centerFrequency;
quint64 m_recordLength; //!< record length in seconds computed from file size quint64 m_recordLength; //!< record length in seconds computed from file size
quint64 m_startingTimeStamp; quint64 m_startingTimeStamp;
const QTimer& m_masterTimer; QTimer m_masterTimer;
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest; QNetworkRequest m_networkRequest;

2
plugins/samplesource/testsource/testsourcethread.cpp
View File

@ -75,7 +75,7 @@ TestSourceThread::~TestSourceThread()
void TestSourceThread::startWork() void TestSourceThread::startWork()
{ {
//m_timer.setTimerType(Qt::PreciseTimer); m_timer.setTimerType(Qt::PreciseTimer);
connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick())); connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick()));
m_timer.start(50); m_timer.start(50);
m_startWaitMutex.lock(); m_startWaitMutex.lock();

6
sdrgui/gui/samplingdevicecontrol.cpp
View File

@ -73,6 +73,12 @@ void SamplingDeviceControl::setSelectedDeviceIndex(int index)
DeviceEnumerator::instance()->changeTxSelection(m_deviceTabIndex, index); DeviceEnumerator::instance()->changeTxSelection(m_deviceTabIndex, index);
ui->deviceSelectedText->setText(samplingDevice->displayedName); ui->deviceSelectedText->setText(samplingDevice->displayedName);
} }
else if (m_deviceType == 2) // MIMO
{
const PluginInterface::SamplingDevice *samplingDevice = DeviceEnumerator::instance()->getMIMOSamplingDevice(index);
DeviceEnumerator::instance()->changeMIMOSelection(m_deviceTabIndex, index);
ui->deviceSelectedText->setText(samplingDevice->displayedName);
}
m_selectedDeviceIndex = index; m_selectedDeviceIndex = index;
} }