VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 05:11:49 -05:00
Code Issues Projects Releases Wiki Activity

Web API: report Tx channel info summary (2)

Browse Source
This commit is contained in:
f4exb 2017-11-19 19:33:20 +01:00
parent 4169833b4d
commit c8ac9fbf05
6 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channeltx/modam/ammod.cpp
View File

@ -74,12 +74,14 @@ AMMod::AMMod(DeviceSinkAPI *deviceAPI) :
m_channelizer = new UpChannelizer(this); m_channelizer = new UpChannelizer(this);
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
m_deviceAPI->addThreadedSource(m_threadedChannelizer); m_deviceAPI->addThreadedSource(m_threadedChannelizer);
m_deviceAPI->addChannelAPI(this);
applySettings(m_settings, true); applySettings(m_settings, true);
} }
AMMod::~AMMod() AMMod::~AMMod()
{ {
m_deviceAPI->removeChannelAPI(this);
m_deviceAPI->removeThreadedSource(m_threadedChannelizer); m_deviceAPI->removeThreadedSource(m_threadedChannelizer);
delete m_threadedChannelizer; delete m_threadedChannelizer;
delete m_channelizer; delete m_channelizer;

2
plugins/channeltx/modatv/atvmod.cpp
View File

@ -92,6 +92,7 @@ ATVMod::ATVMod(DeviceSinkAPI *deviceAPI) :
m_channelizer = new UpChannelizer(this); m_channelizer = new UpChannelizer(this);
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
m_deviceAPI->addThreadedSource(m_threadedChannelizer); m_deviceAPI->addThreadedSource(m_threadedChannelizer);
m_deviceAPI->addChannelAPI(this);
applySettings(m_settings, true); // does applyStandard() too; applySettings(m_settings, true); // does applyStandard() too;
} }
@ -100,6 +101,7 @@ ATVMod::~ATVMod()
{ {
if (m_video.isOpened()) m_video.release(); if (m_video.isOpened()) m_video.release();
releaseCameras(); releaseCameras();
m_deviceAPI->removeChannelAPI(this);
m_deviceAPI->removeThreadedSource(m_threadedChannelizer); m_deviceAPI->removeThreadedSource(m_threadedChannelizer);
delete m_threadedChannelizer; delete m_threadedChannelizer;
delete m_channelizer; delete m_channelizer;

2
plugins/channeltx/modnfm/nfmmod.cpp
View File

@ -79,6 +79,7 @@ NFMMod::NFMMod(DeviceSinkAPI *deviceAPI) :
m_channelizer = new UpChannelizer(this); m_channelizer = new UpChannelizer(this);
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
m_deviceAPI->addThreadedSource(m_threadedChannelizer); m_deviceAPI->addThreadedSource(m_threadedChannelizer);
m_deviceAPI->addChannelAPI(this);
applySettings(m_settings, true); applySettings(m_settings, true);
} }
@ -86,6 +87,7 @@ NFMMod::NFMMod(DeviceSinkAPI *deviceAPI) :
NFMMod::~NFMMod() NFMMod::~NFMMod()
{ {
DSPEngine::instance()->removeAudioSource(&m_audioFifo); DSPEngine::instance()->removeAudioSource(&m_audioFifo);
m_deviceAPI->removeChannelAPI(this);
m_deviceAPI->removeThreadedSource(m_threadedChannelizer); m_deviceAPI->removeThreadedSource(m_threadedChannelizer);
delete m_threadedChannelizer; delete m_threadedChannelizer;
delete m_channelizer; delete m_channelizer;

2
plugins/channeltx/modssb/ssbmod.cpp
View File

@ -98,6 +98,7 @@ SSBMod::SSBMod(DeviceSinkAPI *deviceAPI) :
m_channelizer = new UpChannelizer(this); m_channelizer = new UpChannelizer(this);
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
m_deviceAPI->addThreadedSource(m_threadedChannelizer); m_deviceAPI->addThreadedSource(m_threadedChannelizer);
m_deviceAPI->addChannelAPI(this);
applySettings(m_settings, true); applySettings(m_settings, true);
} }
@ -122,6 +123,7 @@ SSBMod::~SSBMod()
DSPEngine::instance()->removeAudioSource(&m_audioFifo); DSPEngine::instance()->removeAudioSource(&m_audioFifo);
m_deviceAPI->removeChannelAPI(this);
m_deviceAPI->removeThreadedSource(m_threadedChannelizer); m_deviceAPI->removeThreadedSource(m_threadedChannelizer);
delete m_threadedChannelizer; delete m_threadedChannelizer;
delete m_channelizer; delete m_channelizer;

2
plugins/channeltx/modwfm/wfmmod.cpp
View File

@ -85,6 +85,7 @@ WFMMod::WFMMod(DeviceSinkAPI *deviceAPI) :
m_channelizer = new UpChannelizer(this); m_channelizer = new UpChannelizer(this);
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
m_deviceAPI->addThreadedSource(m_threadedChannelizer); m_deviceAPI->addThreadedSource(m_threadedChannelizer);
m_deviceAPI->addChannelAPI(this);
applySettings(m_settings, true); applySettings(m_settings, true);
} }
@ -94,6 +95,7 @@ WFMMod::~WFMMod()
delete m_rfFilter; delete m_rfFilter;
delete[] m_rfFilterBuffer; delete[] m_rfFilterBuffer;
DSPEngine::instance()->removeAudioSource(&m_audioFifo); DSPEngine::instance()->removeAudioSource(&m_audioFifo);
m_deviceAPI->removeChannelAPI(this);
m_deviceAPI->removeThreadedSource(m_threadedChannelizer); m_deviceAPI->removeThreadedSource(m_threadedChannelizer);
delete m_threadedChannelizer; delete m_threadedChannelizer;
delete m_channelizer; delete m_channelizer;

2
plugins/channeltx/udpsink/udpsink.cpp
View File

@ -64,6 +64,7 @@ UDPSink::UDPSink(DeviceSinkAPI *deviceAPI) :
m_channelizer = new UpChannelizer(this); m_channelizer = new UpChannelizer(this);
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
m_deviceAPI->addThreadedSource(m_threadedChannelizer); m_deviceAPI->addThreadedSource(m_threadedChannelizer);
m_deviceAPI->addChannelAPI(this);
applySettings(m_settings, true); applySettings(m_settings, true);
} }
@ -72,6 +73,7 @@ UDPSink::~UDPSink()
{ {
delete[] m_SSBFilterBuffer; delete[] m_SSBFilterBuffer;
delete m_SSBFilter; delete m_SSBFilter;
m_deviceAPI->removeChannelAPI(this);
m_deviceAPI->removeThreadedSource(m_threadedChannelizer); m_deviceAPI->removeThreadedSource(m_threadedChannelizer);
delete m_threadedChannelizer; delete m_threadedChannelizer;
delete m_channelizer; delete m_channelizer;