VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 14:47:50 -04:00
Code Issues Projects Releases Wiki Activity

UDP Source: restore spectrum display

Browse Source
This commit is contained in:
f4exb 2020-08-24 23:27:52 +02:00
parent f5b9c31a45
commit 125930ca7c
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/channeltx/udpsource/udpsourcesource.cpp
View File

@ -29,7 +29,6 @@ UDPSourceSource::UDPSourceSource() :
m_channelFrequencyOffset(0), m_channelFrequencyOffset(0),
m_squelch(1e-6), m_squelch(1e-6),
m_spectrumSink(nullptr), m_spectrumSink(nullptr),
m_spectrumEnabled(false),
m_spectrumChunkSize(2160), m_spectrumChunkSize(2160),
m_spectrumChunkCounter(0), m_spectrumChunkCounter(0),
m_magsq(1e-10), m_magsq(1e-10),
@ -238,21 +237,22 @@ void UDPSourceSource::modulateSample()
initSquelch(false); initSquelch(false);
} }
if (m_spectrumSink && m_spectrumEnabled && (m_spectrumChunkCounter < m_spectrumChunkSize - 1)) if (m_spectrumSink)
{ {
Sample s; Sample s;
s.m_real = (FixReal) m_modSample.real(); s.m_real = (FixReal) m_modSample.real();
s.m_imag = (FixReal) m_modSample.imag(); s.m_imag = (FixReal) m_modSample.imag();
m_sampleBuffer.push_back(s); m_sampleBuffer.push_back(s);
m_spectrumChunkCounter++; m_spectrumChunkCounter++;
}
else if (m_spectrumSink) if (m_spectrumChunkCounter == m_spectrumChunkSize)
{ {
m_spectrumSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), false); m_spectrumSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), false);
m_sampleBuffer.clear(); m_sampleBuffer.clear();
m_spectrumChunkCounter = 0; m_spectrumChunkCounter = 0;
} }
} }
}
void UDPSourceSource::calculateLevel(Real sample) void UDPSourceSource::calculateLevel(Real sample)
{ {
@ -292,11 +292,6 @@ void UDPSourceSource::calculateLevel(Complex sample)
} }
} }
void UDPSourceSource::setSpectrumEnabled(bool enabled)
{
m_spectrumEnabled = enabled;
}
void UDPSourceSource::resetReadIndex() void UDPSourceSource::resetReadIndex()
{ {
m_udpHandler.resetReadIndex(); m_udpHandler.resetReadIndex();

2
plugins/channeltx/udpsource/udpsourcesource.h
View File

@ -49,7 +49,6 @@ public:
int32_t getBufferGauge() const { return m_udpHandler.getBufferGauge(); } int32_t getBufferGauge() const { return m_udpHandler.getBufferGauge(); }
bool getSquelchOpen() const { return m_squelchOpen; } bool getSquelchOpen() const { return m_squelchOpen; }
void setSpectrumEnabled(bool enabled);
void resetReadIndex(); void resetReadIndex();
void applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force = false); void applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force = false);
@ -75,7 +74,6 @@ private:
Complex m_modSample; Complex m_modSample;
BasebandSampleSink* m_spectrumSink; BasebandSampleSink* m_spectrumSink;
bool m_spectrumEnabled;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;
int m_spectrumChunkSize; int m_spectrumChunkSize;
int m_spectrumChunkCounter; int m_spectrumChunkCounter;