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

Removed direct reference to the DeviceSourceAPI in the source GUIs

Browse Source
This commit is contained in:
f4exb
2017-10-30 00:45:23 +01:00
parent e520ef5aeb
commit da3e6dcdfb
46 changed files with 105 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/bladerfinput/bladerfinputgui.cpp
+7 -8
View File
@@ -29,10 +29,9 @@
#include <device/devicesourceapi.h>
#include "device/deviceuiset.h"
BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
BladerfInputGui::BladerfInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::BladerfInputGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
m_settings(),
@@ -40,7 +39,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *device
m_sampleRate(0),
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = (BladerfInput*) m_deviceAPI->getSampleSource();
m_sampleSource = (BladerfInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -335,15 +334,15 @@ void BladerfInputGui::on_startStop_toggled(bool checked)
{
if (checked)
{
if (m_deviceAPI->initAcquisition())
if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
{
m_deviceAPI->startAcquisition();
m_deviceUISet->m_deviceSourceAPI->startAcquisition();
DSPEngine::instance()->startAudioOutput();
}
}
else
{
m_deviceAPI->stopAcquisition();
m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
DSPEngine::instance()->stopAudioOutput();
}
}
@@ -371,7 +370,7 @@ void BladerfInputGui::updateHardware()
void BladerfInputGui::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSourceAPI->state();
if(m_lastEngineState != state)
{
@@ -388,7 +387,7 @@ void BladerfInputGui::updateStatus()
break;
case DSPDeviceSourceEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSourceAPI->errorMessage());
break;
default:
break;
plugins/samplesource/bladerfinput/bladerfinputgui.h
+1 -2
View File
@@ -36,7 +36,7 @@ class BladerfInputGui : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit BladerfInputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~BladerfInputGui();
virtual void destroy();
@@ -54,7 +54,6 @@ public:
private:
Ui::BladerfInputGui* ui;
DeviceSourceAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
bool m_forceSettings;
BladeRFInputSettings m_settings;
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
+1 -2
View File
@@ -81,12 +81,11 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
PluginInstanceGUI* BlderfInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sourceId == m_deviceTypeID)
{
BladerfInputGui* gui = new BladerfInputGui(deviceAPI, deviceUISet);
BladerfInputGui* gui = new BladerfInputGui(deviceUISet);
*widget = gui;
return gui;
}
plugins/samplesource/bladerfinput/bladerfinputplugin.h
-1
View File
@@ -41,7 +41,6 @@ public:
virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);