merge

plugins/samplemimo/testmi/testmithread.cpp

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

plugins/samplesource/filesource/filesourceinput.cpp

@@ -60,8 +60,7 @@ FileSourceInput::FileSourceInput(DeviceAPI *deviceAPI) :
 	m_sampleSize(0),
 	m_centerFrequency(0),
 	m_recordLength(0),
-    m_startingTimeStamp(0),
-    m_masterTimer(deviceAPI->getMasterTimer())
+    m_startingTimeStamp(0)
 {
     m_deviceAPI->setNbSourceStreams(1);
     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());
     m_networkManager = new QNetworkAccessManager();
     connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
+    m_masterTimer.setTimerType(Qt::PreciseTimer);
+    m_masterTimer.start(50);
 }
 
 FileSourceInput::~FileSourceInput()
 {
+    m_masterTimer.stop();
     disconnect(m_networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(networkManagerFinished(QNetworkReply*)));
     delete m_networkManager;
 

plugins/samplesource/filesource/filesourceinput.h

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

plugins/samplesource/testsource/testsourcethread.cpp

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

sdrgui/gui/samplingdevicecontrol.cpp

@@ -73,6 +73,12 @@ void SamplingDeviceControl::setSelectedDeviceIndex(int index)
         DeviceEnumerator::instance()->changeTxSelection(m_deviceTabIndex, index);
         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;
 }