VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-29 13:32:26 -04:00
Code Issues Projects Releases Wiki Activity

WDSP: sender: replaced static methods

Browse Source
This commit is contained in:
f4exb 2024-07-24 23:30:41 +02:00
parent 0bd4bbe0d4
commit dac4bc08df
3 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wdsp/RXA.cpp
View File

@ -201,7 +201,7 @@ RXA* RXA::create_rxa (
rxa->ndb); // addr of database pointer rxa->ndb); // addr of database pointer
// Post filter display send - send spectrum display (after S-meter in the block diagram) // Post filter display send - send spectrum display (after S-meter in the block diagram)
rxa->sender = SENDER::create_sender ( rxa->sender = new SENDER (
0, // run 0, // run
0, // flag 0, // flag
0, // mode 0, // mode
@ -583,7 +583,7 @@ void RXA::destroy_rxa (RXA *rxa)
AMD::destroy_amd (rxa->amd); AMD::destroy_amd (rxa->amd);
AMSQ::destroy_amsq (rxa->amsq); AMSQ::destroy_amsq (rxa->amsq);
delete (rxa->smeter); delete (rxa->smeter);
SENDER::destroy_sender (rxa->sender); delete (rxa->sender);
delete (rxa->bpsnba); delete (rxa->bpsnba);
delete (rxa->nbp0); delete (rxa->nbp0);
delete (rxa->ndb); delete (rxa->ndb);
@ -610,7 +610,7 @@ void RXA::flush_rxa (RXA *rxa)
rxa->adcmeter->flush(); rxa->adcmeter->flush();
rxa->nbp0->flush(); rxa->nbp0->flush();
rxa->bpsnba->flush(); rxa->bpsnba->flush();
SENDER::flush_sender (rxa->sender); rxa->sender->flush();
rxa->smeter->flush(); rxa->smeter->flush();
AMSQ::flush_amsq (rxa->amsq); AMSQ::flush_amsq (rxa->amsq);
AMD::flush_amd (rxa->amd); AMD::flush_amd (rxa->amd);
@ -643,7 +643,7 @@ void RXA::xrxa (RXA *rxa)
rxa->bpsnba->exec_in(0); rxa->bpsnba->exec_in(0);
rxa->nbp0->execute(0); rxa->nbp0->execute(0);
rxa->smeter->execute(); rxa->smeter->execute();
SENDER::xsender (rxa->sender); rxa->sender->execute();
AMSQ::xamsqcap (rxa->amsq); AMSQ::xamsqcap (rxa->amsq);
rxa->bpsnba->exec_out(0); rxa->bpsnba->exec_out(0);
AMD::xamd (rxa->amd); AMD::xamd (rxa->amd);
@ -756,7 +756,7 @@ void RXA::setDSPSamplerate (RXA *rxa, int dsp_rate)
rxa->nbp0->setSamplerate(rxa->dsp_rate); rxa->nbp0->setSamplerate(rxa->dsp_rate);
rxa->bpsnba->setSamplerate(rxa->dsp_rate); rxa->bpsnba->setSamplerate(rxa->dsp_rate);
rxa->smeter->setSamplerate(rxa->dsp_rate); rxa->smeter->setSamplerate(rxa->dsp_rate);
SENDER::setSamplerate_sender (rxa->sender, rxa->dsp_rate); rxa->sender->setSamplerate(rxa->dsp_rate);
AMSQ::setSamplerate_amsq (rxa->amsq, rxa->dsp_rate); AMSQ::setSamplerate_amsq (rxa->amsq, rxa->dsp_rate);
AMD::setSamplerate_amd (rxa->amd, rxa->dsp_rate); AMD::setSamplerate_amd (rxa->amd, rxa->dsp_rate);
FMD::setSamplerate_fmd (rxa->fmd, rxa->dsp_rate); FMD::setSamplerate_fmd (rxa->fmd, rxa->dsp_rate);
@ -822,9 +822,9 @@ void RXA::setDSPBuffsize (RXA *rxa, int dsp_size)
rxa->bpsnba->setBuffers(rxa->midbuff, rxa->midbuff); rxa->bpsnba->setBuffers(rxa->midbuff, rxa->midbuff);
rxa->bpsnba->setSize(rxa->dsp_size); rxa->bpsnba->setSize(rxa->dsp_size);
rxa->smeter->setBuffers(rxa->midbuff); rxa->smeter->setBuffers(rxa->midbuff);
rxa->smeter->METER::setSize(rxa->dsp_size); rxa->smeter->setSize(rxa->dsp_size);
SENDER::setBuffers_sender (rxa->sender, rxa->midbuff); rxa->sender->setBuffers(rxa->midbuff);
SENDER::setSize_sender (rxa->sender, rxa->dsp_size); rxa->sender->setSize(rxa->dsp_size);
AMSQ::setBuffers_amsq (rxa->amsq, rxa->midbuff, rxa->midbuff, rxa->midbuff); AMSQ::setBuffers_amsq (rxa->amsq, rxa->midbuff, rxa->midbuff, rxa->midbuff);
AMSQ::setSize_amsq (rxa->amsq, rxa->dsp_size); AMSQ::setSize_amsq (rxa->amsq, rxa->dsp_size);
AMD::setBuffers_amd (rxa->amd, rxa->midbuff, rxa->midbuff); AMD::setBuffers_amd (rxa->amd, rxa->midbuff, rxa->midbuff);
@ -847,8 +847,8 @@ void RXA::setDSPBuffsize (RXA *rxa, int dsp_size)
BANDPASS::setSize_bandpass (rxa->bp1, rxa->dsp_size); BANDPASS::setSize_bandpass (rxa->bp1, rxa->dsp_size);
WCPAGC::setBuffers_wcpagc (rxa->agc, rxa->midbuff, rxa->midbuff); WCPAGC::setBuffers_wcpagc (rxa->agc, rxa->midbuff, rxa->midbuff);
WCPAGC::setSize_wcpagc (rxa->agc, rxa->dsp_size); WCPAGC::setSize_wcpagc (rxa->agc, rxa->dsp_size);
rxa->agcmeter->METER::setBuffers(rxa->midbuff); rxa->agcmeter->setBuffers(rxa->midbuff);
rxa->agcmeter->METER::setSize(rxa->dsp_size); rxa->agcmeter->setSize(rxa->dsp_size);
SIPHON::setBuffers_siphon (rxa->sip1, rxa->midbuff); SIPHON::setBuffers_siphon (rxa->sip1, rxa->midbuff);
SIPHON::setSize_siphon (rxa->sip1, rxa->dsp_size); SIPHON::setSize_siphon (rxa->sip1, rxa->dsp_size);
CBL::setBuffers_cbl (rxa->cbl, rxa->midbuff, rxa->midbuff); CBL::setBuffers_cbl (rxa->cbl, rxa->midbuff, rxa->midbuff);
@ -868,7 +868,7 @@ void RXA::setDSPBuffsize (RXA *rxa, int dsp_size)
void RXA::setSpectrumProbe(BufferProbe *spectrumProbe) void RXA::setSpectrumProbe(BufferProbe *spectrumProbe)
{ {
SENDER::SetSpectrum(*this, 1, spectrumProbe); sender->SetSpectrum(1, spectrumProbe);
sender->run = 1; sender->run = 1;
} }

55
wdsp/sender.cpp
View File

@ -32,37 +32,30 @@ warren@wpratt.com
namespace WDSP { namespace WDSP {
SENDER* SENDER::create_sender (int run, int flag, int mode, int size, float* in) SENDER::SENDER(int _run, int _flag, int _mode, int _size, float* _in) :
run(_run),
flag(_flag),
mode(_mode),
size(_size),
in(_in)
{ {
SENDER *a = new SENDER; spectrumProbe = nullptr;
a->run = run;
a->flag = flag;
a->mode = mode;
a->size = size;
a->in = in;
a->spectrumProbe = nullptr;
return a;
} }
void SENDER::destroy_sender (SENDER *a) void SENDER::flush()
{
delete (a);
}
void SENDER::flush_sender (SENDER *)
{ {
} }
void SENDER::xsender (SENDER *a) void SENDER::execute()
{ {
if (a->run && a->flag) if (run && flag)
{ {
switch (a->mode) switch (mode)
{ {
case 0: case 0:
{ {
if (a->spectrumProbe) { if (spectrumProbe) {
a->spectrumProbe->proceed(a->in, a->size); spectrumProbe->proceed(in, size);
} }
break; break;
} }
@ -70,33 +63,31 @@ void SENDER::xsender (SENDER *a)
} }
} }
void SENDER::setBuffers_sender (SENDER *a, float* in) void SENDER::setBuffers(float* _in)
{ {
a->in = in; in = _in;
} }
void SENDER::setSamplerate_sender (SENDER *a, int) void SENDER::setSamplerate(int)
{ {
flush_sender (a); flush();
} }
void SENDER::setSize_sender (SENDER *a, int size) void SENDER::setSize(int _size)
{ {
a->size = size; size = _size;
} }
/******************************************************************************************************** /********************************************************************************************************
* * * *
* RXA Properties * * Public Properties *
* * * *
********************************************************************************************************/ ********************************************************************************************************/
void SENDER::SetSpectrum (RXA& rxa, int flag, BufferProbe *spectrumProbe) void SENDER::SetSpectrum(int _flag, BufferProbe *_spectrumProbe)
{ {
SENDER *a; flag = _flag;
a = rxa.sender; spectrumProbe = _spectrumProbe;
a->flag = flag;
a->spectrumProbe = spectrumProbe;
} }
} // namespace WDSP } // namespace WDSP

20
wdsp/sender.hpp
View File

@ -50,16 +50,16 @@ public:
float* in; // buffer from which to take the data float* in; // buffer from which to take the data
BufferProbe *spectrumProbe; // this is the data handler actually BufferProbe *spectrumProbe; // this is the data handler actually
static SENDER* create_sender (int run, int flag, int mode, int size, float* in); SENDER(int run, int flag, int mode, int size, float* in);
static void destroy_sender (SENDER *a); ~SENDER() = default;
static void flush_sender (SENDER *a);
static void xsender (SENDER *a); void flush();
static void setBuffers_sender (SENDER *a, float* in); void execute();
static void setSamplerate_sender (SENDER *a, int rate); void setBuffers(float* in);
static void setSize_sender (SENDER *a, int size); void setSamplerate(int rate);
// RXA Properties void setSize(int size);
static void SetSpectrum (RXA& rxa, int flag, BufferProbe *spectrumProbe); // Public Properties
// TXA Properties void SetSpectrum(int flag, BufferProbe *spectrumProbe);
}; };
} // namespace WDSP } // namespace WDSP