VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-23 18:52:28 -04:00
Code Issues Projects Releases Wiki Activity

NFM demod: protect from m_basebandSink is null

Browse Source
This commit is contained in:
f4exb 2022-10-13 01:45:31 +02:00
parent 6ecad314e1
commit 8721379b55
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -133,6 +133,7 @@ void NFMDemod::start()
.arg(getIndexInDeviceSet()) .arg(getIndexInDeviceSet())
); );
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(

20
plugins/channelrx/demodnfm/nfmdemod.h
View File

@ -120,14 +120,20 @@ public:
const QStringList& channelSettingsKeys, const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response); SWGSDRangel::SWGChannelSettings& response);
const Real *getCtcssToneSet(int& nbTones) const { return m_basebandSink->getCtcssToneSet(nbTones); } const Real *getCtcssToneSet(int& nbTones) const { return m_running ? m_basebandSink->getCtcssToneSet(nbTones) : nullptr; }
bool getSquelchOpen() const { return m_basebandSink->getSquelchOpen(); } bool getSquelchOpen() const { return m_running && m_basebandSink->getSquelchOpen(); }
void getMagSqLevels(double& avg, double& peak, int& nbSamples) { m_basebandSink->getMagSqLevels(avg, peak, nbSamples); }
void setMessageQueueToGUI(MessageQueue* queue) override { void getMagSqLevels(double& avg, double& peak, int& nbSamples)
ChannelAPI::setMessageQueueToGUI(queue); {
m_basebandSink->setMessageQueueToGUI(queue); if (m_running) {
m_basebandSink->getMagSqLevels(avg, peak, nbSamples);
} else {
avg = 0.0; peak = 0.0; nbSamples = 1;
} }
int getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); } }
void setMessageQueueToGUI(MessageQueue* queue) override { ChannelAPI::setMessageQueueToGUI(queue); }
int getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
uint32_t getNumberOfDeviceStreams() const; uint32_t getNumberOfDeviceStreams() const;