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

Use the modulator constructor separated from the modulator GUI constructor

Browse Source
This commit is contained in:
f4exb
2017-11-08 22:54:58 +01:00
parent 9c68da780e
commit f2b53fe3aa
29 changed files with 87 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/modssb/ssbmodgui.cpp
+6 -5
View File
@@ -33,14 +33,15 @@
#include "dsp/dspengine.h"
#include "mainwindow.h"
SSBModGUI* SSBModGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet)
SSBModGUI* SSBModGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx)
{
SSBModGUI* gui = new SSBModGUI(pluginAPI, deviceUISet);
SSBModGUI* gui = new SSBModGUI(pluginAPI, deviceUISet, channelTx);
return gui;
}
void SSBModGUI::destroy()
{
delete this;
}
void SSBModGUI::setName(const QString& name)
@@ -350,7 +351,7 @@ void SSBModGUI::onMenuDoubleClicked()
}
}
SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, QWidget* parent) :
SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::SSBModGUI),
m_pluginAPI(pluginAPI),
@@ -373,7 +374,7 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, QWidget* pa
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
m_ssbMod = new SSBMod(m_deviceUISet->m_deviceSinkAPI);
m_ssbMod = (SSBMod*) channelTx; //new SSBMod(m_deviceUISet->m_deviceSinkAPI);
m_ssbMod->setSpectrumSampleSink(m_spectrumVis);
m_ssbMod->setMessageQueueToGUI(getInputMessageQueue());
@@ -425,7 +426,7 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, QWidget* pa
SSBModGUI::~SSBModGUI()
{
m_deviceUISet->removeRxChannelInstance(this);
delete m_ssbMod;
delete m_ssbMod; // TODO: check this: when the GUI closes it has to delete the modulator
delete m_spectrumVis;
delete ui;
}