VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 15:33:34 -04:00
Code Issues Projects Releases Wiki Activity

Removed direct reference to the DeviceSinkAPI in the sink GUIs. Removed DeviceSourceAPI forward declaration in source GUI headers

Browse Source
This commit is contained in:
f4exb
2017-10-30 02:54:22 +01:00
parent b770e656b3
commit c3de895301
37 changed files with 62 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp
+8 -9
View File
@@ -29,10 +29,9 @@
#include "bladerfoutputgui.h"
#include "bladerf/devicebladerfvalues.h"
BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
BladerfOutputGui::BladerfOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::BladerfOutputGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
m_settings(),
@@ -40,7 +39,7 @@ BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *device
m_sampleRate(0),
m_lastEngineState((DSPDeviceSinkEngine::State)-1)
{
m_deviceSampleSink = (BladerfOutput*) m_deviceAPI->getSampleSink();
m_deviceSampleSink = (BladerfOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@@ -63,7 +62,7 @@ BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *device
displaySettings();
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceUISet->m_deviceSinkAPI->getDeviceUID());
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
}
@@ -309,15 +308,15 @@ void BladerfOutputGui::on_startStop_toggled(bool checked)
{
if (checked)
{
if (m_deviceAPI->initGeneration())
if (m_deviceUISet->m_deviceSinkAPI->initGeneration())
{
m_deviceAPI->startGeneration();
m_deviceUISet->m_deviceSinkAPI->startGeneration();
DSPEngine::instance()->startAudioInput();
}
}
else
{
m_deviceAPI->stopGeneration();
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
DSPEngine::instance()->stopAudioInput();
}
}
@@ -333,7 +332,7 @@ void BladerfOutputGui::updateHardware()
void BladerfOutputGui::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSinkAPI->state();
if(m_lastEngineState != state)
{
@@ -350,7 +349,7 @@ void BladerfOutputGui::updateStatus()
break;
case DSPDeviceSinkEngine::StError:
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
QMessageBox::information(this, tr("Message"), m_deviceAPI->errorMessage());
QMessageBox::information(this, tr("Message"), m_deviceUISet->m_deviceSinkAPI->errorMessage());
break;
default:
break;