VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp
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;

4
plugins/samplesink/bladerfoutput/bladerfoutputgui.h
View File

@ -25,7 +25,6 @@
#include "bladerfoutput.h"
class DeviceSinkAPI;
class DeviceSampleSink;
class DeviceUISet;
@ -37,7 +36,7 @@ class BladerfOutputGui : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit BladerfOutputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~BladerfOutputGui();
virtual void destroy();
@ -55,7 +54,6 @@ public:
private:
Ui::BladerfOutputGui* ui;
DeviceSinkAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
bool m_forceSettings;
BladeRFOutputSettings m_settings;

3
plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp
View File

@ -80,12 +80,11 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks()
PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sinkId == m_deviceTypeID)
{
BladerfOutputGui* gui = new BladerfOutputGui(deviceAPI, deviceUISet);
BladerfOutputGui* gui = new BladerfOutputGui(deviceUISet);
*widget = gui;
return gui;
}

1
plugins/samplesink/bladerfoutput/bladerfoutputplugin.h
View File

@ -40,7 +40,6 @@ public:
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);

17
plugins/samplesink/filesink/filesinkgui.cpp
View File

@ -35,10 +35,9 @@
#include "device/deviceuiset.h"
#include "filesinkgui.h"
FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
FileSinkGui::FileSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::FileSinkGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
m_settings(),
@ -61,14 +60,14 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWi
ui->fileNameText->setText(m_fileName);
connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&(m_deviceUISet->m_deviceSinkAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500);
displaySettings();
m_deviceSampleSink = (FileSinkOutput*) m_deviceAPI->getSampleSink();
m_deviceSampleSink = (FileSinkOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
}
@ -208,7 +207,7 @@ void FileSinkGui::updateHardware()
void FileSinkGui::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSinkAPI->state();
if(m_lastEngineState != state)
{
@ -225,7 +224,7 @@ void FileSinkGui::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;
@ -262,9 +261,9 @@ void FileSinkGui::on_startStop_toggled(bool checked)
{
if (checked)
{
if (m_deviceAPI->initGeneration())
if (m_deviceUISet->m_deviceSinkAPI->initGeneration())
{
if (!m_deviceAPI->startGeneration())
if (!m_deviceUISet->m_deviceSinkAPI->startGeneration())
{
qDebug("FileSinkGui::on_startStop_toggled: device start failed");
}
@ -274,7 +273,7 @@ void FileSinkGui::on_startStop_toggled(bool checked)
}
else
{
m_deviceAPI->stopGeneration();
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
DSPEngine::instance()->stopAudioInput();
}
}

4
plugins/samplesink/filesink/filesinkgui.h
View File

@ -27,7 +27,6 @@
#include "filesinksettings.h"
class DeviceSinkAPI;
class DeviceSampleSink;
class DeviceUISet;
@ -39,7 +38,7 @@ class FileSinkGui : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit FileSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit FileSinkGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~FileSinkGui();
virtual void destroy();
@ -57,7 +56,6 @@ public:
private:
Ui::FileSinkGui* ui;
DeviceSinkAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
bool m_forceSettings;
FileSinkSettings m_settings;

3
plugins/samplesink/filesink/filesinkplugin.cpp
View File

@ -72,12 +72,11 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks()
PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sinkId == m_deviceTypeID)
{
FileSinkGui* gui = new FileSinkGui(deviceAPI, deviceUISet);
FileSinkGui* gui = new FileSinkGui(deviceUISet);
*widget = gui;
return gui;
}

1
plugins/samplesink/filesink/filesinkplugin.h
View File

@ -40,7 +40,6 @@ public:
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);

19
plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
View File

@ -33,10 +33,9 @@
#include "ui_hackrfoutputgui.h"
HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::HackRFOutputGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
m_settings(),
@ -44,7 +43,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUI
m_lastEngineState((DSPDeviceSinkEngine::State)-1),
m_doApplySettings(true)
{
m_deviceSampleSink = (HackRFOutput*) m_deviceAPI->getSampleSink();
m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@ -302,21 +301,21 @@ void HackRFOutputGui::on_startStop_toggled(bool checked)
if (checked)
{
// forcibly stop the Rx if present before starting
if (m_deviceAPI->getSourceBuddies().size() > 0)
if (m_deviceUISet->m_deviceSinkAPI->getSourceBuddies().size() > 0)
{
DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[0];
DeviceSourceAPI *buddy = m_deviceUISet->m_deviceSinkAPI->getSourceBuddies()[0];
buddy->stopAcquisition();
}
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()->startAudioInput();
}
}
@ -335,7 +334,7 @@ void HackRFOutputGui::updateHardware()
void HackRFOutputGui::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSinkAPI->state();
if(m_lastEngineState != state)
{
@ -353,7 +352,7 @@ void HackRFOutputGui::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;

4
plugins/samplesink/hackrfoutput/hackrfoutputgui.h
View File

@ -27,7 +27,6 @@
#define HACKRF_MAX_DEVICE (32)
class DeviceSinkAPI;
class DeviceSampleSink;
class DeviceUISet;
@ -47,7 +46,7 @@ public:
HACKRF_IMGREJ_NB
} HackRFImgRejValue;
explicit HackRFOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~HackRFOutputGui();
virtual void destroy();
@ -65,7 +64,6 @@ public:
private:
Ui::HackRFOutputGui* ui;
DeviceSinkAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
bool m_forceSettings;
HackRFOutputSettings m_settings;

3
plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
View File

@ -119,12 +119,11 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks()
PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sinkId == m_deviceTypeID)
{
HackRFOutputGui* gui = new HackRFOutputGui(deviceAPI, deviceUISet);
HackRFOutputGui* gui = new HackRFOutputGui(deviceUISet);
*widget = gui;
return gui;
}

1
plugins/samplesink/hackrfoutput/hackrfoutputplugin.h
View File

@ -39,7 +39,6 @@ public:
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);

19
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -26,10 +26,9 @@
#include "device/deviceuiset.h"
#include "limesdroutputgui.h"
LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::LimeSDROutputGUI),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_settings(),
m_sampleRate(0),
@ -39,7 +38,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *device
m_statusCounter(0),
m_deviceStatusCounter(0)
{
m_limeSDROutput = (LimeSDROutput*) m_deviceAPI->getSampleSink();
m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
ui->setupUi(this);
@ -74,7 +73,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(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);
@ -311,7 +310,7 @@ void LimeSDROutputGUI::updateHardware()
void LimeSDROutputGUI::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSinkAPI->state();
if(m_lastEngineState != state)
{
@ -328,7 +327,7 @@ void LimeSDROutputGUI::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;
@ -354,7 +353,7 @@ void LimeSDROutputGUI::updateStatus()
}
else
{
if (m_deviceAPI->isBuddyLeader())
if (m_deviceUISet->m_deviceSinkAPI->isBuddyLeader())
{
LimeSDROutput::MsgGetDeviceInfo* message = LimeSDROutput::MsgGetDeviceInfo::create();
m_limeSDROutput->getInputMessageQueue()->push(message);
@ -373,15 +372,15 @@ void LimeSDROutputGUI::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();
}
}

4
plugins/samplesink/limesdroutput/limesdroutputgui.h
View File

@ -25,7 +25,6 @@
#include "limesdroutput.h"
class DeviceSinkAPI;
class DeviceSampleSink;
class DeviceUISet;
@ -37,7 +36,7 @@ class LimeSDROutputGUI : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~LimeSDROutputGUI();
virtual void destroy();
@ -55,7 +54,6 @@ public:
private:
Ui::LimeSDROutputGUI* ui;
DeviceSinkAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
LimeSDROutput* m_limeSDROutput; //!< Same object as above but gives easy access to LimeSDROutput methods and attributes that are used intensively
LimeSDROutputSettings m_settings;

3
plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
View File

@ -99,12 +99,11 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks()
PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sinkId == m_deviceTypeID)
{
LimeSDROutputGUI* gui = new LimeSDROutputGUI(deviceAPI, deviceUISet);
LimeSDROutputGUI* gui = new LimeSDROutputGUI(deviceUISet);
*widget = gui;
return gui;
}

1
plugins/samplesink/limesdroutput/limesdroutputplugin.h
View File

@ -39,7 +39,6 @@ public:
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);

17
plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
View File

@ -28,10 +28,9 @@
#include "plutosdroutputgui.h"
#include "ui_plutosdroutputgui.h"
PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::PlutoSDROutputGUI),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_settings(),
m_forceSettings(true),
@ -42,7 +41,7 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *devi
m_doApplySettings(true),
m_statusCounter(0)
{
m_sampleSink = (PlutoSDROutput*) m_deviceAPI->getSampleSink();
m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
@ -156,15 +155,15 @@ void PlutoSDROutputGUI::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()->startAudioOutput();
}
}
else
{
m_deviceAPI->stopGeneration();
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
DSPEngine::instance()->stopAudioOutput();
}
}
@ -306,7 +305,7 @@ void PlutoSDROutputGUI::blockApplySettings(bool block)
void PlutoSDROutputGUI::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSinkAPI->state();
if(m_lastEngineState != state)
{
@ -323,7 +322,7 @@ void PlutoSDROutputGUI::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;
@ -352,7 +351,7 @@ void PlutoSDROutputGUI::updateStatus()
if (m_statusCounter % 10 == 0) // 5s
{
if (m_deviceAPI->isBuddyLeader()) {
if (m_deviceUISet->m_deviceSinkAPI->isBuddyLeader()) {
((PlutoSDROutput *) m_sampleSink)->fetchTemperature();
}

4
plugins/samplesink/plutosdroutput/plutosdroutputgui.h
View File

@ -26,7 +26,6 @@
#include "plutosdroutputsettings.h"
class DeviceSinkAPI;
class DeviceSampleSink;
class DeviceUISet;
@ -38,7 +37,7 @@ class PlutoSDROutputGUI : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit PlutoSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~PlutoSDROutputGUI();
virtual void destroy();
@ -54,7 +53,6 @@ public:
private:
Ui::PlutoSDROutputGUI* ui;
DeviceSinkAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
PlutoSDROutputSettings m_settings;
bool m_forceSettings;

3
plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp
View File

@ -84,12 +84,11 @@ PluginInterface::SamplingDevices PlutoSDROutputPlugin::enumSampleSinks()
PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sinkId == m_deviceTypeID)
{
PlutoSDROutputGUI* gui = new PlutoSDROutputGUI(deviceAPI, deviceUISet);
PlutoSDROutputGUI* gui = new PlutoSDROutputGUI(deviceUISet);
*widget = gui;
return gui;
}

1
plugins/samplesink/plutosdroutput/plutosdroutputplugin.h
View File

@ -39,7 +39,6 @@ public:
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);

17
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp
View File

@ -41,10 +41,9 @@
#include "device/deviceuiset.h"
#include "sdrdaemonsinkgui.h"
SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::SDRdaemonSinkGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_settings(),
m_deviceSampleSink(0),
@ -80,12 +79,12 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *device
ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
ui->sampleRate->setValueRange(7, 32000U, 9000000U);
connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&(m_deviceUISet->m_deviceSinkAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500);
m_deviceSampleSink = (SDRdaemonSinkOutput*) m_deviceAPI->getSampleSink();
m_deviceSampleSink = (SDRdaemonSinkOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
@ -352,7 +351,7 @@ void SDRdaemonSinkGui::updateHardware()
void SDRdaemonSinkGui::updateStatus()
{
int state = m_deviceAPI->state();
int state = m_deviceUISet->m_deviceSinkAPI->state();
if(m_lastEngineState != state)
{
@ -369,7 +368,7 @@ void SDRdaemonSinkGui::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;
@ -502,9 +501,9 @@ void SDRdaemonSinkGui::on_startStop_toggled(bool checked)
{
if (checked)
{
if (m_deviceAPI->initGeneration())
if (m_deviceUISet->m_deviceSinkAPI->initGeneration())
{
if (!m_deviceAPI->startGeneration())
if (!m_deviceUISet->m_deviceSinkAPI->startGeneration())
{
qDebug("SDRdaemonSinkGui::on_startStop_toggled: device start failed");
}
@ -514,7 +513,7 @@ void SDRdaemonSinkGui::on_startStop_toggled(bool checked)
}
else
{
m_deviceAPI->stopGeneration();
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
DSPEngine::instance()->stopAudioInput();
}
}

4
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h
View File

@ -28,7 +28,6 @@
#include "sdrdaemonsinkoutput.h"
class DeviceSinkAPI;
class DeviceSampleSink;
class DeviceUISet;
@ -40,7 +39,7 @@ class SDRdaemonSinkGui : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
explicit SDRdaemonSinkGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~SDRdaemonSinkGui();
virtual void destroy();
@ -58,7 +57,6 @@ public:
private:
Ui::SDRdaemonSinkGui* ui;
DeviceSinkAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
SDRdaemonSinkSettings m_settings; //!< current settings
SDRdaemonSinkSettings m_controlSettings; //!< settings last sent to device via control port

3
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp
View File

@ -73,12 +73,11 @@ PluginInterface::SamplingDevices SDRdaemonSinkPlugin::enumSampleSinks()
PluginInstanceGUI* SDRdaemonSinkPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sinkId == m_deviceTypeID)
{
SDRdaemonSinkGui* gui = new SDRdaemonSinkGui(deviceAPI, deviceUISet);
SDRdaemonSinkGui* gui = new SDRdaemonSinkGui(deviceUISet);
*widget = gui;
return gui;
}

1
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.h
View File

@ -40,7 +40,6 @@ public:
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId,
QWidget **widget,
DeviceSinkAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);

1
plugins/samplesource/airspy/airspygui.h
View File

@ -26,7 +26,6 @@
#define AIRSPY_MAX_DEVICE (32)
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/bladerfinput/bladerfinputgui.h
View File

@ -25,7 +25,6 @@
#include "bladerfinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/fcdpro/fcdprogui.h
View File

@ -25,7 +25,6 @@
#include "fcdproinput.h"
class DeviceSourceAPI;
class QWidget;
class DeviceUISet;

1
plugins/samplesource/fcdproplus/fcdproplusgui.h
View File

@ -25,7 +25,6 @@
#include "fcdproplusinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/filesource/filesourcegui.h
View File

@ -25,7 +25,6 @@
#include "filesourceinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/hackrfinput/hackrfinputgui.h
View File

@ -27,7 +27,6 @@
#define HACKRF_MAX_DEVICE (32)
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/limesdrinput/limesdrinputgui.h
View File

@ -25,7 +25,6 @@
#include "limesdrinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/plutosdrinput/plutosdrinputgui.h
View File

@ -26,7 +26,6 @@
#include "plutosdrinputsettings.h"
class DeviceSourceAPI;
class DeviceSampleSource;
class DeviceUISet;

1
plugins/samplesource/rtlsdr/rtlsdrgui.h
View File

@ -25,7 +25,6 @@
#include "rtlsdrinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.h
View File

@ -26,7 +26,6 @@
#include "sdrdaemonsourceinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {

1
plugins/samplesource/sdrplay/sdrplaygui.h
View File

@ -27,7 +27,6 @@
#include "sdrplayinput.h"
#include "sdrplaysettings.h"
class DeviceSampleSource;
class DeviceSourceAPI;
class DeviceUISet;

2
sdrgui/mainwindow.cpp
View File

@ -312,7 +312,6 @@ void MainWindow::addSinkDevice()
PluginInstanceGUI *pluginUI = m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI(
m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkId(),
&gui,
m_deviceUIs.back()->m_deviceSinkAPI,
m_deviceUIs.back());
m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue());
m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI);
@ -1005,7 +1004,6 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused
PluginInstanceGUI *pluginUI = deviceUI->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI(
deviceUI->m_deviceSinkAPI->getSampleSinkId(),
&gui,
deviceUI->m_deviceSinkAPI,
deviceUI);
deviceUI->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue());
deviceUI->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI);

1
sdrgui/plugin/plugininterface.h
View File

@ -81,7 +81,6 @@ public:
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
const QString& sinkId __attribute__((unused)),
QWidget **widget __attribute__((unused)),
DeviceSinkAPI *deviceAPI __attribute__((unused)),
DeviceUISet *deviceUISet __attribute__((unused)))
{ return 0; }