VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-15 12:18:48 -04:00
Code Issues Projects Releases Wiki Activity

Multi device support: removed as much as possible (now) DSPDeviceEngine dependencies in MainWindow to source plugin GUIs. This includes file sink handling. Applies to BladeRF only.

Browse Source
This commit is contained in:
f4exb
2016-05-12 10:31:57 +02:00
parent 5de7b0168e
commit e25c465b82
25 changed files with 271 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/bladerf/bladerfgui.cpp
+58
View File
@@ -22,7 +22,10 @@
#include "ui_bladerfgui.h"
#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filesink.h"
#include "bladerfgui.h"
BladerfGui::BladerfGui(PluginAPI* pluginAPI, QWidget* parent) :
@@ -31,6 +34,7 @@ BladerfGui::BladerfGui(PluginAPI* pluginAPI, QWidget* parent) :
m_pluginAPI(pluginAPI),
m_settings(),
m_sampleSource(NULL),
m_sampleRate(0),
m_lastEngineState((DSPDeviceEngine::State)-1)
{
ui->setupUi(this);
@@ -57,10 +61,19 @@ BladerfGui::BladerfGui(PluginAPI* pluginAPI, QWidget* parent) :
m_sampleSource = new BladerfInput();
DSPEngine::instance()->setSource(m_sampleSource);
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_pluginAPI->getDeviceUID());
m_fileSink = new FileSink(std::string(recFileNameCStr));
m_pluginAPI->addSink(m_fileSink);
connect(m_pluginAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
}
BladerfGui::~BladerfGui()
{
m_pluginAPI->removeSink(m_fileSink);
delete m_fileSink;
delete m_sampleSource; // Valgrind memcheck
delete ui;
}
@@ -129,6 +142,37 @@ bool BladerfGui::handleMessage(const Message& message)
}
}
void BladerfGui::handleDSPMessages()
{
Message* message;
while ((message = m_pluginAPI->getDeviceOutputMessageQueue()->pop()) != 0)
{
qDebug("BladerfGui::handleDSPMessages: message: %s", message->getIdentifier());
if (DSPSignalNotification::match(*message))
{
DSPSignalNotification* notif = (DSPSignalNotification*) message;
m_sampleRate = notif->getSampleRate();
m_deviceCenterFrequency = notif->getCenterFrequency();
qDebug("BladerfGui::handleDSPMessages: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency());
// updateCenterFreqDisplay();
updateSampleRateAndFrequency();
// qDebug() << "MainWindow::handleDSPMessages: forward to file sink";
// m_fileSink->handleMessage(*notif);
delete message;
}
}
}
void BladerfGui::updateSampleRateAndFrequency()
{
m_pluginAPI->getSpectrum()->setSampleRate(m_sampleRate);
m_pluginAPI->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency);
ui->deviceRateLabel->setText(tr("%1k").arg((float)m_sampleRate / 1000));
}
void BladerfGui::displaySettings()
{
ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
@@ -325,6 +369,20 @@ void BladerfGui::on_startStop_toggled(bool checked)
}
}
void BladerfGui::on_record_toggled(bool checked)
{
if (checked)
{
ui->record->setStyleSheet("QToolButton { background-color : red; }");
m_fileSink->startRecording();
}
else
{
ui->record->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
m_fileSink->stopRecording();
}
}
void BladerfGui::updateHardware()
{
qDebug() << "BladerfGui::updateHardware";