VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -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/hackrfinput/hackrfinputgui.cpp
+9 -10
View File
@@ -32,17 +32,16 @@
#include "ui_hackrfinputgui.h"
HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::HackRFInputGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_settings(),
m_forceSettings(true),
m_sampleSource(NULL),
m_lastEngineState((DSPDeviceSourceEngine::State)-1)
{
m_sampleSource = (HackRFInput*) m_deviceAPI->getSampleSource();
m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource();
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -332,21 +331,21 @@ void HackRFInputGui::on_startStop_toggled(bool checked)
if (checked)
{
// forcibly stop the Tx if present before starting
if (m_deviceAPI->getSinkBuddies().size() > 0)
if (m_deviceUISet->m_deviceSourceAPI->getSinkBuddies().size() > 0)
{
DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0];
DeviceSinkAPI *buddy = m_deviceUISet->m_deviceSourceAPI->getSinkBuddies()[0];
buddy->stopGeneration();
}
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();
}
}
@@ -374,7 +373,7 @@ void HackRFInputGui::updateHardware()
void HackRFInputGui::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSourceAPI->state();
if(m_lastEngineState != state)
{
@@ -392,7 +391,7 @@ void HackRFInputGui::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/hackrfinput/hackrfinputgui.h
+1 -2
View File
@@ -46,7 +46,7 @@ public:
HACKRF_IMGREJ_NB
} HackRFImgRejValue;
explicit HackRFInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~HackRFInputGui();
virtual void destroy();
@@ -64,7 +64,6 @@ public:
private:
Ui::HackRFInputGui* ui;
DeviceSourceAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
HackRFInputSettings m_settings;
bool m_forceSettings;
plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+1 -2
View File
@@ -120,12 +120,11 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources()
PluginInstanceGUI* HackRFInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sourceId == m_deviceTypeID)
{
HackRFInputGui* gui = new HackRFInputGui(deviceAPI, deviceUISet);
HackRFInputGui* gui = new HackRFInputGui(deviceUISet);
*widget = gui;
return gui;
}
plugins/samplesource/hackrfinput/hackrfinputplugin.h
-1
View File
@@ -39,7 +39,6 @@ public:
virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);