mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-27 23:36:35 -04:00
Removed direct reference to the DeviceSinkAPI in the sink GUIs. Removed DeviceSourceAPI forward declaration in source GUI headers
This commit is contained in:
parent
b770e656b3
commit
c3de895301
@ -29,10 +29,9 @@
|
|||||||
#include "bladerfoutputgui.h"
|
#include "bladerfoutputgui.h"
|
||||||
#include "bladerf/devicebladerfvalues.h"
|
#include "bladerf/devicebladerfvalues.h"
|
||||||
|
|
||||||
BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
|
BladerfOutputGui::BladerfOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::BladerfOutputGui),
|
ui(new Ui::BladerfOutputGui),
|
||||||
m_deviceAPI(deviceAPI),
|
|
||||||
m_deviceUISet(deviceUISet),
|
m_deviceUISet(deviceUISet),
|
||||||
m_forceSettings(true),
|
m_forceSettings(true),
|
||||||
m_settings(),
|
m_settings(),
|
||||||
@ -40,7 +39,7 @@ BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *device
|
|||||||
m_sampleRate(0),
|
m_sampleRate(0),
|
||||||
m_lastEngineState((DSPDeviceSinkEngine::State)-1)
|
m_lastEngineState((DSPDeviceSinkEngine::State)-1)
|
||||||
{
|
{
|
||||||
m_deviceSampleSink = (BladerfOutput*) m_deviceAPI->getSampleSink();
|
m_deviceSampleSink = (BladerfOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
@ -63,7 +62,7 @@ BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *device
|
|||||||
displaySettings();
|
displaySettings();
|
||||||
|
|
||||||
char recFileNameCStr[30];
|
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);
|
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
|
||||||
}
|
}
|
||||||
@ -309,15 +308,15 @@ void BladerfOutputGui::on_startStop_toggled(bool checked)
|
|||||||
{
|
{
|
||||||
if (checked)
|
if (checked)
|
||||||
{
|
{
|
||||||
if (m_deviceAPI->initGeneration())
|
if (m_deviceUISet->m_deviceSinkAPI->initGeneration())
|
||||||
{
|
{
|
||||||
m_deviceAPI->startGeneration();
|
m_deviceUISet->m_deviceSinkAPI->startGeneration();
|
||||||
DSPEngine::instance()->startAudioInput();
|
DSPEngine::instance()->startAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_deviceAPI->stopGeneration();
|
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
|
||||||
DSPEngine::instance()->stopAudioInput();
|
DSPEngine::instance()->stopAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -333,7 +332,7 @@ void BladerfOutputGui::updateHardware()
|
|||||||
|
|
||||||
void BladerfOutputGui::updateStatus()
|
void BladerfOutputGui::updateStatus()
|
||||||
{
|
{
|
||||||
int state = m_deviceAPI->state();
|
int state = m_deviceUISet->m_deviceSinkAPI->state();
|
||||||
|
|
||||||
if(m_lastEngineState != state)
|
if(m_lastEngineState != state)
|
||||||
{
|
{
|
||||||
@ -350,7 +349,7 @@ void BladerfOutputGui::updateStatus()
|
|||||||
break;
|
break;
|
||||||
case DSPDeviceSinkEngine::StError:
|
case DSPDeviceSinkEngine::StError:
|
||||||
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "bladerfoutput.h"
|
#include "bladerfoutput.h"
|
||||||
|
|
||||||
class DeviceSinkAPI;
|
|
||||||
class DeviceSampleSink;
|
class DeviceSampleSink;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
@ -37,7 +36,7 @@ class BladerfOutputGui : public QWidget, public PluginInstanceGUI {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit BladerfOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
|
explicit BladerfOutputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
|
||||||
virtual ~BladerfOutputGui();
|
virtual ~BladerfOutputGui();
|
||||||
virtual void destroy();
|
virtual void destroy();
|
||||||
|
|
||||||
@ -55,7 +54,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
Ui::BladerfOutputGui* ui;
|
Ui::BladerfOutputGui* ui;
|
||||||
|
|
||||||
DeviceSinkAPI* m_deviceAPI;
|
|
||||||
DeviceUISet* m_deviceUISet;
|
DeviceUISet* m_deviceUISet;
|
||||||
bool m_forceSettings;
|
bool m_forceSettings;
|
||||||
BladeRFOutputSettings m_settings;
|
BladeRFOutputSettings m_settings;
|
||||||
|
@ -80,12 +80,11 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks()
|
|||||||
PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI(
|
PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet)
|
DeviceUISet *deviceUISet)
|
||||||
{
|
{
|
||||||
if(sinkId == m_deviceTypeID)
|
if(sinkId == m_deviceTypeID)
|
||||||
{
|
{
|
||||||
BladerfOutputGui* gui = new BladerfOutputGui(deviceAPI, deviceUISet);
|
BladerfOutputGui* gui = new BladerfOutputGui(deviceUISet);
|
||||||
*widget = gui;
|
*widget = gui;
|
||||||
return gui;
|
return gui;
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,6 @@ public:
|
|||||||
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet);
|
DeviceUISet *deviceUISet);
|
||||||
|
|
||||||
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
||||||
|
@ -35,10 +35,9 @@
|
|||||||
#include "device/deviceuiset.h"
|
#include "device/deviceuiset.h"
|
||||||
#include "filesinkgui.h"
|
#include "filesinkgui.h"
|
||||||
|
|
||||||
FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
|
FileSinkGui::FileSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::FileSinkGui),
|
ui(new Ui::FileSinkGui),
|
||||||
m_deviceAPI(deviceAPI),
|
|
||||||
m_deviceUISet(deviceUISet),
|
m_deviceUISet(deviceUISet),
|
||||||
m_forceSettings(true),
|
m_forceSettings(true),
|
||||||
m_settings(),
|
m_settings(),
|
||||||
@ -61,14 +60,14 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWi
|
|||||||
|
|
||||||
ui->fileNameText->setText(m_fileName);
|
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_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
|
||||||
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
||||||
m_statusTimer.start(500);
|
m_statusTimer.start(500);
|
||||||
|
|
||||||
displaySettings();
|
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);
|
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -208,7 +207,7 @@ void FileSinkGui::updateHardware()
|
|||||||
|
|
||||||
void FileSinkGui::updateStatus()
|
void FileSinkGui::updateStatus()
|
||||||
{
|
{
|
||||||
int state = m_deviceAPI->state();
|
int state = m_deviceUISet->m_deviceSinkAPI->state();
|
||||||
|
|
||||||
if(m_lastEngineState != state)
|
if(m_lastEngineState != state)
|
||||||
{
|
{
|
||||||
@ -225,7 +224,7 @@ void FileSinkGui::updateStatus()
|
|||||||
break;
|
break;
|
||||||
case DSPDeviceSinkEngine::StError:
|
case DSPDeviceSinkEngine::StError:
|
||||||
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -262,9 +261,9 @@ void FileSinkGui::on_startStop_toggled(bool checked)
|
|||||||
{
|
{
|
||||||
if (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");
|
qDebug("FileSinkGui::on_startStop_toggled: device start failed");
|
||||||
}
|
}
|
||||||
@ -274,7 +273,7 @@ void FileSinkGui::on_startStop_toggled(bool checked)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_deviceAPI->stopGeneration();
|
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
|
||||||
DSPEngine::instance()->stopAudioInput();
|
DSPEngine::instance()->stopAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "filesinksettings.h"
|
#include "filesinksettings.h"
|
||||||
|
|
||||||
|
|
||||||
class DeviceSinkAPI;
|
|
||||||
class DeviceSampleSink;
|
class DeviceSampleSink;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
@ -39,7 +38,7 @@ class FileSinkGui : public QWidget, public PluginInstanceGUI {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit FileSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
|
explicit FileSinkGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
|
||||||
virtual ~FileSinkGui();
|
virtual ~FileSinkGui();
|
||||||
virtual void destroy();
|
virtual void destroy();
|
||||||
|
|
||||||
@ -57,7 +56,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
Ui::FileSinkGui* ui;
|
Ui::FileSinkGui* ui;
|
||||||
|
|
||||||
DeviceSinkAPI* m_deviceAPI;
|
|
||||||
DeviceUISet* m_deviceUISet;
|
DeviceUISet* m_deviceUISet;
|
||||||
bool m_forceSettings;
|
bool m_forceSettings;
|
||||||
FileSinkSettings m_settings;
|
FileSinkSettings m_settings;
|
||||||
|
@ -72,12 +72,11 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks()
|
|||||||
PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI(
|
PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet)
|
DeviceUISet *deviceUISet)
|
||||||
{
|
{
|
||||||
if(sinkId == m_deviceTypeID)
|
if(sinkId == m_deviceTypeID)
|
||||||
{
|
{
|
||||||
FileSinkGui* gui = new FileSinkGui(deviceAPI, deviceUISet);
|
FileSinkGui* gui = new FileSinkGui(deviceUISet);
|
||||||
*widget = gui;
|
*widget = gui;
|
||||||
return gui;
|
return gui;
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,6 @@ public:
|
|||||||
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet);
|
DeviceUISet *deviceUISet);
|
||||||
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
||||||
|
|
||||||
|
@ -33,10 +33,9 @@
|
|||||||
|
|
||||||
#include "ui_hackrfoutputgui.h"
|
#include "ui_hackrfoutputgui.h"
|
||||||
|
|
||||||
HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
|
HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::HackRFOutputGui),
|
ui(new Ui::HackRFOutputGui),
|
||||||
m_deviceAPI(deviceAPI),
|
|
||||||
m_deviceUISet(deviceUISet),
|
m_deviceUISet(deviceUISet),
|
||||||
m_forceSettings(true),
|
m_forceSettings(true),
|
||||||
m_settings(),
|
m_settings(),
|
||||||
@ -44,7 +43,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUI
|
|||||||
m_lastEngineState((DSPDeviceSinkEngine::State)-1),
|
m_lastEngineState((DSPDeviceSinkEngine::State)-1),
|
||||||
m_doApplySettings(true)
|
m_doApplySettings(true)
|
||||||
{
|
{
|
||||||
m_deviceSampleSink = (HackRFOutput*) m_deviceAPI->getSampleSink();
|
m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
@ -302,21 +301,21 @@ void HackRFOutputGui::on_startStop_toggled(bool checked)
|
|||||||
if (checked)
|
if (checked)
|
||||||
{
|
{
|
||||||
// forcibly stop the Rx if present before starting
|
// 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();
|
buddy->stopAcquisition();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_deviceAPI->initGeneration())
|
if (m_deviceUISet->m_deviceSinkAPI->initGeneration())
|
||||||
{
|
{
|
||||||
m_deviceAPI->startGeneration();
|
m_deviceUISet->m_deviceSinkAPI->startGeneration();
|
||||||
DSPEngine::instance()->startAudioInput();
|
DSPEngine::instance()->startAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_deviceAPI->stopGeneration();
|
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
|
||||||
DSPEngine::instance()->startAudioInput();
|
DSPEngine::instance()->startAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -335,7 +334,7 @@ void HackRFOutputGui::updateHardware()
|
|||||||
|
|
||||||
void HackRFOutputGui::updateStatus()
|
void HackRFOutputGui::updateStatus()
|
||||||
{
|
{
|
||||||
int state = m_deviceAPI->state();
|
int state = m_deviceUISet->m_deviceSinkAPI->state();
|
||||||
|
|
||||||
if(m_lastEngineState != state)
|
if(m_lastEngineState != state)
|
||||||
{
|
{
|
||||||
@ -353,7 +352,7 @@ void HackRFOutputGui::updateStatus()
|
|||||||
break;
|
break;
|
||||||
case DSPDeviceSinkEngine::StError:
|
case DSPDeviceSinkEngine::StError:
|
||||||
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#define HACKRF_MAX_DEVICE (32)
|
#define HACKRF_MAX_DEVICE (32)
|
||||||
|
|
||||||
class DeviceSinkAPI;
|
|
||||||
class DeviceSampleSink;
|
class DeviceSampleSink;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
@ -47,7 +46,7 @@ public:
|
|||||||
HACKRF_IMGREJ_NB
|
HACKRF_IMGREJ_NB
|
||||||
} HackRFImgRejValue;
|
} HackRFImgRejValue;
|
||||||
|
|
||||||
explicit HackRFOutputGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
|
explicit HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
|
||||||
virtual ~HackRFOutputGui();
|
virtual ~HackRFOutputGui();
|
||||||
virtual void destroy();
|
virtual void destroy();
|
||||||
|
|
||||||
@ -65,7 +64,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
Ui::HackRFOutputGui* ui;
|
Ui::HackRFOutputGui* ui;
|
||||||
|
|
||||||
DeviceSinkAPI* m_deviceAPI;
|
|
||||||
DeviceUISet* m_deviceUISet;
|
DeviceUISet* m_deviceUISet;
|
||||||
bool m_forceSettings;
|
bool m_forceSettings;
|
||||||
HackRFOutputSettings m_settings;
|
HackRFOutputSettings m_settings;
|
||||||
|
@ -119,12 +119,11 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks()
|
|||||||
PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
|
PluginInstanceGUI* HackRFOutputPlugin::createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet)
|
DeviceUISet *deviceUISet)
|
||||||
{
|
{
|
||||||
if(sinkId == m_deviceTypeID)
|
if(sinkId == m_deviceTypeID)
|
||||||
{
|
{
|
||||||
HackRFOutputGui* gui = new HackRFOutputGui(deviceAPI, deviceUISet);
|
HackRFOutputGui* gui = new HackRFOutputGui(deviceUISet);
|
||||||
*widget = gui;
|
*widget = gui;
|
||||||
return gui;
|
return gui;
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,6 @@ public:
|
|||||||
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet);
|
DeviceUISet *deviceUISet);
|
||||||
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
||||||
|
|
||||||
|
@ -26,10 +26,9 @@
|
|||||||
#include "device/deviceuiset.h"
|
#include "device/deviceuiset.h"
|
||||||
#include "limesdroutputgui.h"
|
#include "limesdroutputgui.h"
|
||||||
|
|
||||||
LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
|
LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::LimeSDROutputGUI),
|
ui(new Ui::LimeSDROutputGUI),
|
||||||
m_deviceAPI(deviceAPI),
|
|
||||||
m_deviceUISet(deviceUISet),
|
m_deviceUISet(deviceUISet),
|
||||||
m_settings(),
|
m_settings(),
|
||||||
m_sampleRate(0),
|
m_sampleRate(0),
|
||||||
@ -39,7 +38,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *device
|
|||||||
m_statusCounter(0),
|
m_statusCounter(0),
|
||||||
m_deviceStatusCounter(0)
|
m_deviceStatusCounter(0)
|
||||||
{
|
{
|
||||||
m_limeSDROutput = (LimeSDROutput*) m_deviceAPI->getSampleSink();
|
m_limeSDROutput = (LimeSDROutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
@ -74,7 +73,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *device
|
|||||||
displaySettings();
|
displaySettings();
|
||||||
|
|
||||||
char recFileNameCStr[30];
|
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);
|
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
|
||||||
|
|
||||||
@ -311,7 +310,7 @@ void LimeSDROutputGUI::updateHardware()
|
|||||||
|
|
||||||
void LimeSDROutputGUI::updateStatus()
|
void LimeSDROutputGUI::updateStatus()
|
||||||
{
|
{
|
||||||
int state = m_deviceAPI->state();
|
int state = m_deviceUISet->m_deviceSinkAPI->state();
|
||||||
|
|
||||||
if(m_lastEngineState != state)
|
if(m_lastEngineState != state)
|
||||||
{
|
{
|
||||||
@ -328,7 +327,7 @@ void LimeSDROutputGUI::updateStatus()
|
|||||||
break;
|
break;
|
||||||
case DSPDeviceSinkEngine::StError:
|
case DSPDeviceSinkEngine::StError:
|
||||||
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -354,7 +353,7 @@ void LimeSDROutputGUI::updateStatus()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (m_deviceAPI->isBuddyLeader())
|
if (m_deviceUISet->m_deviceSinkAPI->isBuddyLeader())
|
||||||
{
|
{
|
||||||
LimeSDROutput::MsgGetDeviceInfo* message = LimeSDROutput::MsgGetDeviceInfo::create();
|
LimeSDROutput::MsgGetDeviceInfo* message = LimeSDROutput::MsgGetDeviceInfo::create();
|
||||||
m_limeSDROutput->getInputMessageQueue()->push(message);
|
m_limeSDROutput->getInputMessageQueue()->push(message);
|
||||||
@ -373,15 +372,15 @@ void LimeSDROutputGUI::on_startStop_toggled(bool checked)
|
|||||||
{
|
{
|
||||||
if (checked)
|
if (checked)
|
||||||
{
|
{
|
||||||
if (m_deviceAPI->initGeneration())
|
if (m_deviceUISet->m_deviceSinkAPI->initGeneration())
|
||||||
{
|
{
|
||||||
m_deviceAPI->startGeneration();
|
m_deviceUISet->m_deviceSinkAPI->startGeneration();
|
||||||
DSPEngine::instance()->startAudioInput();
|
DSPEngine::instance()->startAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_deviceAPI->stopGeneration();
|
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
|
||||||
DSPEngine::instance()->stopAudioInput();
|
DSPEngine::instance()->stopAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "limesdroutput.h"
|
#include "limesdroutput.h"
|
||||||
|
|
||||||
class DeviceSinkAPI;
|
|
||||||
class DeviceSampleSink;
|
class DeviceSampleSink;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
@ -37,7 +36,7 @@ class LimeSDROutputGUI : public QWidget, public PluginInstanceGUI {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
|
explicit LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent = 0);
|
||||||
virtual ~LimeSDROutputGUI();
|
virtual ~LimeSDROutputGUI();
|
||||||
virtual void destroy();
|
virtual void destroy();
|
||||||
|
|
||||||
@ -55,7 +54,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
Ui::LimeSDROutputGUI* ui;
|
Ui::LimeSDROutputGUI* ui;
|
||||||
|
|
||||||
DeviceSinkAPI* m_deviceAPI;
|
|
||||||
DeviceUISet* m_deviceUISet;
|
DeviceUISet* m_deviceUISet;
|
||||||
LimeSDROutput* m_limeSDROutput; //!< Same object as above but gives easy access to LimeSDROutput methods and attributes that are used intensively
|
LimeSDROutput* m_limeSDROutput; //!< Same object as above but gives easy access to LimeSDROutput methods and attributes that are used intensively
|
||||||
LimeSDROutputSettings m_settings;
|
LimeSDROutputSettings m_settings;
|
||||||
|
@ -99,12 +99,11 @@ PluginInterface::SamplingDevices LimeSDROutputPlugin::enumSampleSinks()
|
|||||||
PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
|
PluginInstanceGUI* LimeSDROutputPlugin::createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet)
|
DeviceUISet *deviceUISet)
|
||||||
{
|
{
|
||||||
if(sinkId == m_deviceTypeID)
|
if(sinkId == m_deviceTypeID)
|
||||||
{
|
{
|
||||||
LimeSDROutputGUI* gui = new LimeSDROutputGUI(deviceAPI, deviceUISet);
|
LimeSDROutputGUI* gui = new LimeSDROutputGUI(deviceUISet);
|
||||||
*widget = gui;
|
*widget = gui;
|
||||||
return gui;
|
return gui;
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,6 @@ public:
|
|||||||
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet);
|
DeviceUISet *deviceUISet);
|
||||||
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
||||||
|
|
||||||
|
@ -28,10 +28,9 @@
|
|||||||
#include "plutosdroutputgui.h"
|
#include "plutosdroutputgui.h"
|
||||||
#include "ui_plutosdroutputgui.h"
|
#include "ui_plutosdroutputgui.h"
|
||||||
|
|
||||||
PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
|
PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::PlutoSDROutputGUI),
|
ui(new Ui::PlutoSDROutputGUI),
|
||||||
m_deviceAPI(deviceAPI),
|
|
||||||
m_deviceUISet(deviceUISet),
|
m_deviceUISet(deviceUISet),
|
||||||
m_settings(),
|
m_settings(),
|
||||||
m_forceSettings(true),
|
m_forceSettings(true),
|
||||||
@ -42,7 +41,7 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *devi
|
|||||||
m_doApplySettings(true),
|
m_doApplySettings(true),
|
||||||
m_statusCounter(0)
|
m_statusCounter(0)
|
||||||
{
|
{
|
||||||
m_sampleSink = (PlutoSDROutput*) m_deviceAPI->getSampleSink();
|
m_sampleSink = (PlutoSDROutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink();
|
||||||
|
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
|
||||||
@ -156,15 +155,15 @@ void PlutoSDROutputGUI::on_startStop_toggled(bool checked)
|
|||||||
{
|
{
|
||||||
if (checked)
|
if (checked)
|
||||||
{
|
{
|
||||||
if (m_deviceAPI->initGeneration())
|
if (m_deviceUISet->m_deviceSinkAPI->initGeneration())
|
||||||
{
|
{
|
||||||
m_deviceAPI->startGeneration();
|
m_deviceUISet->m_deviceSinkAPI->startGeneration();
|
||||||
DSPEngine::instance()->startAudioOutput();
|
DSPEngine::instance()->startAudioOutput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_deviceAPI->stopGeneration();
|
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
|
||||||
DSPEngine::instance()->stopAudioOutput();
|
DSPEngine::instance()->stopAudioOutput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -306,7 +305,7 @@ void PlutoSDROutputGUI::blockApplySettings(bool block)
|
|||||||
|
|
||||||
void PlutoSDROutputGUI::updateStatus()
|
void PlutoSDROutputGUI::updateStatus()
|
||||||
{
|
{
|
||||||
int state = m_deviceAPI->state();
|
int state = m_deviceUISet->m_deviceSinkAPI->state();
|
||||||
|
|
||||||
if(m_lastEngineState != state)
|
if(m_lastEngineState != state)
|
||||||
{
|
{
|
||||||
@ -323,7 +322,7 @@ void PlutoSDROutputGUI::updateStatus()
|
|||||||
break;
|
break;
|
||||||
case DSPDeviceSinkEngine::StError:
|
case DSPDeviceSinkEngine::StError:
|
||||||
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -352,7 +351,7 @@ void PlutoSDROutputGUI::updateStatus()
|
|||||||
|
|
||||||
if (m_statusCounter % 10 == 0) // 5s
|
if (m_statusCounter % 10 == 0) // 5s
|
||||||
{
|
{
|
||||||
if (m_deviceAPI->isBuddyLeader()) {
|
if (m_deviceUISet->m_deviceSinkAPI->isBuddyLeader()) {
|
||||||
((PlutoSDROutput *) m_sampleSink)->fetchTemperature();
|
((PlutoSDROutput *) m_sampleSink)->fetchTemperature();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
|
|
||||||
#include "plutosdroutputsettings.h"
|
#include "plutosdroutputsettings.h"
|
||||||
|
|
||||||
class DeviceSinkAPI;
|
|
||||||
class DeviceSampleSink;
|
class DeviceSampleSink;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
@ -38,7 +37,7 @@ class PlutoSDROutputGUI : public QWidget, public PluginInstanceGUI {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit PlutoSDROutputGUI(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
|
explicit PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent = 0);
|
||||||
virtual ~PlutoSDROutputGUI();
|
virtual ~PlutoSDROutputGUI();
|
||||||
|
|
||||||
virtual void destroy();
|
virtual void destroy();
|
||||||
@ -54,7 +53,6 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::PlutoSDROutputGUI* ui;
|
Ui::PlutoSDROutputGUI* ui;
|
||||||
DeviceSinkAPI* m_deviceAPI;
|
|
||||||
DeviceUISet* m_deviceUISet;
|
DeviceUISet* m_deviceUISet;
|
||||||
PlutoSDROutputSettings m_settings;
|
PlutoSDROutputSettings m_settings;
|
||||||
bool m_forceSettings;
|
bool m_forceSettings;
|
||||||
|
@ -84,12 +84,11 @@ PluginInterface::SamplingDevices PlutoSDROutputPlugin::enumSampleSinks()
|
|||||||
PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
|
PluginInstanceGUI* PlutoSDROutputPlugin::createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet)
|
DeviceUISet *deviceUISet)
|
||||||
{
|
{
|
||||||
if(sinkId == m_deviceTypeID)
|
if(sinkId == m_deviceTypeID)
|
||||||
{
|
{
|
||||||
PlutoSDROutputGUI* gui = new PlutoSDROutputGUI(deviceAPI, deviceUISet);
|
PlutoSDROutputGUI* gui = new PlutoSDROutputGUI(deviceUISet);
|
||||||
*widget = gui;
|
*widget = gui;
|
||||||
return gui;
|
return gui;
|
||||||
}
|
}
|
||||||
|
@ -39,7 +39,6 @@ public:
|
|||||||
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet);
|
DeviceUISet *deviceUISet);
|
||||||
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
||||||
|
|
||||||
|
@ -41,10 +41,9 @@
|
|||||||
#include "device/deviceuiset.h"
|
#include "device/deviceuiset.h"
|
||||||
#include "sdrdaemonsinkgui.h"
|
#include "sdrdaemonsinkgui.h"
|
||||||
|
|
||||||
SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
|
SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::SDRdaemonSinkGui),
|
ui(new Ui::SDRdaemonSinkGui),
|
||||||
m_deviceAPI(deviceAPI),
|
|
||||||
m_deviceUISet(deviceUISet),
|
m_deviceUISet(deviceUISet),
|
||||||
m_settings(),
|
m_settings(),
|
||||||
m_deviceSampleSink(0),
|
m_deviceSampleSink(0),
|
||||||
@ -80,12 +79,12 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *device
|
|||||||
ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
|
ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
|
||||||
ui->sampleRate->setValueRange(7, 32000U, 9000000U);
|
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_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
|
||||||
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
||||||
m_statusTimer.start(500);
|
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);
|
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()), Qt::QueuedConnection);
|
||||||
|
|
||||||
@ -352,7 +351,7 @@ void SDRdaemonSinkGui::updateHardware()
|
|||||||
|
|
||||||
void SDRdaemonSinkGui::updateStatus()
|
void SDRdaemonSinkGui::updateStatus()
|
||||||
{
|
{
|
||||||
int state = m_deviceAPI->state();
|
int state = m_deviceUISet->m_deviceSinkAPI->state();
|
||||||
|
|
||||||
if(m_lastEngineState != state)
|
if(m_lastEngineState != state)
|
||||||
{
|
{
|
||||||
@ -369,7 +368,7 @@ void SDRdaemonSinkGui::updateStatus()
|
|||||||
break;
|
break;
|
||||||
case DSPDeviceSinkEngine::StError:
|
case DSPDeviceSinkEngine::StError:
|
||||||
ui->startStop->setStyleSheet("QToolButton { background-color : red; }");
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@ -502,9 +501,9 @@ void SDRdaemonSinkGui::on_startStop_toggled(bool checked)
|
|||||||
{
|
{
|
||||||
if (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");
|
qDebug("SDRdaemonSinkGui::on_startStop_toggled: device start failed");
|
||||||
}
|
}
|
||||||
@ -514,7 +513,7 @@ void SDRdaemonSinkGui::on_startStop_toggled(bool checked)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_deviceAPI->stopGeneration();
|
m_deviceUISet->m_deviceSinkAPI->stopGeneration();
|
||||||
DSPEngine::instance()->stopAudioInput();
|
DSPEngine::instance()->stopAudioInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include "sdrdaemonsinkoutput.h"
|
#include "sdrdaemonsinkoutput.h"
|
||||||
|
|
||||||
|
|
||||||
class DeviceSinkAPI;
|
|
||||||
class DeviceSampleSink;
|
class DeviceSampleSink;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
@ -40,7 +39,7 @@ class SDRdaemonSinkGui : public QWidget, public PluginInstanceGUI {
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
|
explicit SDRdaemonSinkGui(DeviceUISet *deviceUISet, QWidget* parent = 0);
|
||||||
virtual ~SDRdaemonSinkGui();
|
virtual ~SDRdaemonSinkGui();
|
||||||
virtual void destroy();
|
virtual void destroy();
|
||||||
|
|
||||||
@ -58,7 +57,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
Ui::SDRdaemonSinkGui* ui;
|
Ui::SDRdaemonSinkGui* ui;
|
||||||
|
|
||||||
DeviceSinkAPI* m_deviceAPI;
|
|
||||||
DeviceUISet* m_deviceUISet;
|
DeviceUISet* m_deviceUISet;
|
||||||
SDRdaemonSinkSettings m_settings; //!< current settings
|
SDRdaemonSinkSettings m_settings; //!< current settings
|
||||||
SDRdaemonSinkSettings m_controlSettings; //!< settings last sent to device via control port
|
SDRdaemonSinkSettings m_controlSettings; //!< settings last sent to device via control port
|
||||||
|
@ -73,12 +73,11 @@ PluginInterface::SamplingDevices SDRdaemonSinkPlugin::enumSampleSinks()
|
|||||||
PluginInstanceGUI* SDRdaemonSinkPlugin::createSampleSinkPluginInstanceGUI(
|
PluginInstanceGUI* SDRdaemonSinkPlugin::createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet)
|
DeviceUISet *deviceUISet)
|
||||||
{
|
{
|
||||||
if(sinkId == m_deviceTypeID)
|
if(sinkId == m_deviceTypeID)
|
||||||
{
|
{
|
||||||
SDRdaemonSinkGui* gui = new SDRdaemonSinkGui(deviceAPI, deviceUISet);
|
SDRdaemonSinkGui* gui = new SDRdaemonSinkGui(deviceUISet);
|
||||||
*widget = gui;
|
*widget = gui;
|
||||||
return gui;
|
return gui;
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,6 @@ public:
|
|||||||
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId,
|
const QString& sinkId,
|
||||||
QWidget **widget,
|
QWidget **widget,
|
||||||
DeviceSinkAPI *deviceAPI,
|
|
||||||
DeviceUISet *deviceUISet);
|
DeviceUISet *deviceUISet);
|
||||||
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
virtual DeviceSampleSink* createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI);
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
|
|
||||||
#define AIRSPY_MAX_DEVICE (32)
|
#define AIRSPY_MAX_DEVICE (32)
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "bladerfinput.h"
|
#include "bladerfinput.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "fcdproinput.h"
|
#include "fcdproinput.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class QWidget;
|
class QWidget;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "fcdproplusinput.h"
|
#include "fcdproplusinput.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "filesourceinput.h"
|
#include "filesourceinput.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
#define HACKRF_MAX_DEVICE (32)
|
#define HACKRF_MAX_DEVICE (32)
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "limesdrinput.h"
|
#include "limesdrinput.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
|
|
||||||
#include "plutosdrinputsettings.h"
|
#include "plutosdrinputsettings.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceSampleSource;
|
class DeviceSampleSource;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "rtlsdrinput.h"
|
#include "rtlsdrinput.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
|
|
||||||
#include "sdrdaemonsourceinput.h"
|
#include "sdrdaemonsourceinput.h"
|
||||||
|
|
||||||
class DeviceSourceAPI;
|
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "sdrplayinput.h"
|
#include "sdrplayinput.h"
|
||||||
#include "sdrplaysettings.h"
|
#include "sdrplaysettings.h"
|
||||||
|
|
||||||
class DeviceSampleSource;
|
|
||||||
class DeviceSourceAPI;
|
class DeviceSourceAPI;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
||||||
|
|
||||||
|
@ -312,7 +312,6 @@ void MainWindow::addSinkDevice()
|
|||||||
PluginInstanceGUI *pluginUI = m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI(
|
PluginInstanceGUI *pluginUI = m_deviceUIs.back()->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI(
|
||||||
m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkId(),
|
m_deviceUIs.back()->m_deviceSinkAPI->getSampleSinkId(),
|
||||||
&gui,
|
&gui,
|
||||||
m_deviceUIs.back()->m_deviceSinkAPI,
|
|
||||||
m_deviceUIs.back());
|
m_deviceUIs.back());
|
||||||
m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue());
|
m_deviceUIs.back()->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue());
|
||||||
m_deviceUIs.back()->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI);
|
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(
|
PluginInstanceGUI *pluginUI = deviceUI->m_deviceSinkAPI->getPluginInterface()->createSampleSinkPluginInstanceGUI(
|
||||||
deviceUI->m_deviceSinkAPI->getSampleSinkId(),
|
deviceUI->m_deviceSinkAPI->getSampleSinkId(),
|
||||||
&gui,
|
&gui,
|
||||||
deviceUI->m_deviceSinkAPI,
|
|
||||||
deviceUI);
|
deviceUI);
|
||||||
deviceUI->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue());
|
deviceUI->m_deviceSinkAPI->getSampleSink()->setMessageQueueToGUI(pluginUI->getInputMessageQueue());
|
||||||
deviceUI->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI);
|
deviceUI->m_deviceSinkAPI->setSampleSinkPluginInstanceUI(pluginUI);
|
||||||
|
@ -81,7 +81,6 @@ public:
|
|||||||
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
virtual PluginInstanceGUI* createSampleSinkPluginInstanceGUI(
|
||||||
const QString& sinkId __attribute__((unused)),
|
const QString& sinkId __attribute__((unused)),
|
||||||
QWidget **widget __attribute__((unused)),
|
QWidget **widget __attribute__((unused)),
|
||||||
DeviceSinkAPI *deviceAPI __attribute__((unused)),
|
|
||||||
DeviceUISet *deviceUISet __attribute__((unused)))
|
DeviceUISet *deviceUISet __attribute__((unused)))
|
||||||
{ return 0; }
|
{ return 0; }
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user