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

SSB demod: protect from m_basebandSink is null

Browse Source
This commit is contained in:
f4exb 2022-10-13 23:14:25 +02:00
parent 02ed98fdfb
commit 0b99a6f309
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/demodssb/ssbdemod.cpp
View File

@ -139,6 +139,7 @@ void SSBDemod::start()
); );
m_basebandSink->setSpectrumSink(&m_spectrumVis); m_basebandSink->setSpectrumSink(&m_spectrumVis);
m_basebandSink->setChannel(this); m_basebandSink->setChannel(this);
m_basebandSink->setMessageQueueToGUI(getMessageQueueToGUI());
m_basebandSink->moveToThread(m_thread); m_basebandSink->moveToThread(m_thread);
QObject::connect( QObject::connect(

22
plugins/channelrx/demodssb/ssbdemod.h
View File

@ -96,16 +96,20 @@ public:
return m_settings.m_inputFrequencyOffset; return m_settings.m_inputFrequencyOffset;
} }
void setMessageQueueToGUI(MessageQueue* queue) override { void setMessageQueueToGUI(MessageQueue* queue) override { ChannelAPI::setMessageQueueToGUI(queue); }
ChannelAPI::setMessageQueueToGUI(queue); uint32_t getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
m_basebandSink->setMessageQueueToGUI(queue); uint32_t getChannelSampleRate() const { return m_running ? m_basebandSink->getChannelSampleRate() : 0; }
} double getMagSq() const { return m_running ? m_basebandSink->getMagSq() : 0.0; }
uint32_t getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); } bool getAudioActive() const { return m_running && m_basebandSink->getAudioActive(); }
uint32_t getChannelSampleRate() const { return m_basebandSink->getChannelSampleRate(); }
double getMagSq() const { return m_basebandSink->getMagSq(); }
bool getAudioActive() const { return m_basebandSink->getAudioActive(); }
void getMagSqLevels(double& avg, double& peak, int& nbSamples) { m_basebandSink->getMagSqLevels(avg, peak, nbSamples); } void getMagSqLevels(double& avg, double& peak, int& nbSamples)
{
if (m_running) {
m_basebandSink->getMagSqLevels(avg, peak, nbSamples);
} else {
avg = 0.0; peak = 0.0; nbSamples = 1;
}
}
virtual int webapiSettingsGet( virtual int webapiSettingsGet(
SWGSDRangel::SWGChannelSettings& response, SWGSDRangel::SWGChannelSettings& response,