Browse Source

ChannelAPI: Add getChannelSampleRate and getAudioSampleRate.

Set m_basebandSink to nullptr when stopped, to avoid dangling pointer.
chirpmodem-v8.0.0
Jon Beniston 2 months ago
parent
commit
4ca7379e7c
  1. 5
      plugins/channelmimo/doa2/doa2.cpp
  2. 1
      plugins/channelmimo/doa2/doa2.h
  3. 9
      plugins/channelrx/chanalyzer/chanalyzer.cpp
  4. 3
      plugins/channelrx/chanalyzer/chanalyzer.h
  5. 6
      plugins/channelrx/chanalyzer/chanalyzergui.cpp
  6. 4
      plugins/channelrx/channelpower/channelpower.cpp
  7. 1
      plugins/channelrx/channelpower/channelpower.h
  8. 5
      plugins/channelrx/demodadsb/adsbdemod.cpp
  9. 1
      plugins/channelrx/demodadsb/adsbdemod.h
  10. 10
      plugins/channelrx/demodais/aisdemod.cpp
  11. 2
      plugins/channelrx/demodais/aisdemod.h
  12. 6
      plugins/channelrx/demodam/amdemod.cpp
  13. 3
      plugins/channelrx/demodam/amdemod.h
  14. 5
      plugins/channelrx/demodatv/atvdemod.cpp
  15. 1
      plugins/channelrx/demodatv/atvdemod.h
  16. 6
      plugins/channelrx/demodbfm/bfmdemod.cpp
  17. 3
      plugins/channelrx/demodbfm/bfmdemod.h
  18. 6
      plugins/channelrx/demodchirpchat/chirpchatdemod.cpp
  19. 1
      plugins/channelrx/demodchirpchat/chirpchatdemod.h
  20. 5
      plugins/channelrx/demoddab/dabdemod.cpp
  21. 3
      plugins/channelrx/demoddab/dabdemod.h
  22. 5
      plugins/channelrx/demoddatv/datvdemod.cpp
  23. 1
      plugins/channelrx/demoddatv/datvdemod.h
  24. 10
      plugins/channelrx/demoddsc/dscdemod.cpp
  25. 2
      plugins/channelrx/demoddsc/dscdemod.h
  26. 7
      plugins/channelrx/demoddsd/dsddemod.cpp
  27. 3
      plugins/channelrx/demoddsd/dsddemod.h
  28. 10
      plugins/channelrx/demodendoftrain/endoftraindemod.cpp
  29. 2
      plugins/channelrx/demodendoftrain/endoftraindemod.h
  30. 5
      plugins/channelrx/demodfreedv/freedvdemod.cpp
  31. 3
      plugins/channelrx/demodfreedv/freedvdemod.h
  32. 7
      plugins/channelrx/demodft8/ft8demod.cpp
  33. 3
      plugins/channelrx/demodft8/ft8demod.h
  34. 5
      plugins/channelrx/demodils/ilsdemod.cpp
  35. 3
      plugins/channelrx/demodils/ilsdemod.h
  36. 10
      plugins/channelrx/demodinmarsat/inmarsatdemod.cpp
  37. 2
      plugins/channelrx/demodinmarsat/inmarsatdemod.h
  38. 6
      plugins/channelrx/demodm17/m17demod.cpp
  39. 3
      plugins/channelrx/demodm17/m17demod.h
  40. 5
      plugins/channelrx/demodmeshcore/meshcoredemod.cpp
  41. 1
      plugins/channelrx/demodmeshcore/meshcoredemod.h
  42. 5
      plugins/channelrx/demodmeshtastic/meshtasticdemod.cpp
  43. 1
      plugins/channelrx/demodmeshtastic/meshtasticdemod.h
  44. 10
      plugins/channelrx/demodnavtex/navtexdemod.cpp
  45. 2
      plugins/channelrx/demodnavtex/navtexdemod.h
  46. 6
      plugins/channelrx/demodnfm/nfmdemod.cpp
  47. 3
      plugins/channelrx/demodnfm/nfmdemod.h
  48. 10
      plugins/channelrx/demodpacket/packetdemod.cpp
  49. 2
      plugins/channelrx/demodpacket/packetdemod.h
  50. 10
      plugins/channelrx/demodpager/pagerdemod.cpp
  51. 2
      plugins/channelrx/demodpager/pagerdemod.h
  52. 10
      plugins/channelrx/demodradiosonde/radiosondedemod.cpp
  53. 2
      plugins/channelrx/demodradiosonde/radiosondedemod.h
  54. 10
      plugins/channelrx/demodrtty/rttydemod.cpp
  55. 2
      plugins/channelrx/demodrtty/rttydemod.h
  56. 1
      plugins/channelrx/demodssb/ssbdemod.cpp
  57. 4
      plugins/channelrx/demodssb/ssbdemod.h
  58. 1
      plugins/channelrx/demodvor/vordemod.cpp
  59. 2
      plugins/channelrx/demodvor/vordemod.h
  60. 2
      plugins/channelrx/demodvormc/vordemodmc.h
  61. 6
      plugins/channelrx/demodwfm/wfmdemod.cpp
  62. 3
      plugins/channelrx/demodwfm/wfmdemod.h
  63. 7
      plugins/channelrx/filesink/filesink.cpp
  64. 1
      plugins/channelrx/filesink/filesink.h
  65. 6
      plugins/channelrx/freqscanner/freqscanner.cpp
  66. 1
      plugins/channelrx/freqscanner/freqscanner.h
  67. 6
      plugins/channelrx/freqtracker/freqtracker.cpp
  68. 1
      plugins/channelrx/freqtracker/freqtracker.h
  69. 5
      plugins/channelrx/heatmap/heatmap.cpp
  70. 1
      plugins/channelrx/heatmap/heatmap.h
  71. 6
      plugins/channelrx/localsink/localsink.cpp
  72. 1
      plugins/channelrx/localsink/localsink.h
  73. 5
      plugins/channelrx/noisefigure/noisefigure.cpp
  74. 1
      plugins/channelrx/noisefigure/noisefigure.h
  75. 5
      plugins/channelrx/radioastronomy/radioastronomy.cpp
  76. 1
      plugins/channelrx/radioastronomy/radioastronomy.h
  77. 5
      plugins/channelrx/radioclock/radioclock.cpp
  78. 1
      plugins/channelrx/radioclock/radioclock.h
  79. 6
      plugins/channelrx/remotesink/remotesink.cpp
  80. 1
      plugins/channelrx/remotesink/remotesink.h
  81. 5
      plugins/channelrx/remotetcpsink/remotetcpsink.cpp
  82. 1
      plugins/channelrx/remotetcpsink/remotetcpsink.h
  83. 7
      plugins/channelrx/sigmffilesink/sigmffilesink.cpp
  84. 1
      plugins/channelrx/sigmffilesink/sigmffilesink.h
  85. 5
      plugins/channelrx/udpsink/udpsink.cpp
  86. 1
      plugins/channelrx/udpsink/udpsink.h
  87. 1
      plugins/channelrx/wdsprx/wdsprx.cpp
  88. 4
      plugins/channelrx/wdsprx/wdsprx.h
  89. 5
      plugins/channeltx/filesource/filesource.cpp
  90. 1
      plugins/channeltx/filesource/filesource.h
  91. 5
      plugins/channeltx/localsource/localsource.cpp
  92. 1
      plugins/channeltx/localsource/localsource.h
  93. 5
      plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
  94. 1
      plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h
  95. 10
      plugins/channeltx/modais/aismod.cpp
  96. 2
      plugins/channeltx/modais/aismod.h
  97. 6
      plugins/channeltx/modam/ammod.cpp
  98. 3
      plugins/channeltx/modam/ammod.h
  99. 5
      plugins/channeltx/modatv/atvmod.cpp
  100. 1
      plugins/channeltx/modatv/atvmod.h
  101. Some files were not shown because too many files have changed in this diff Show More

5
plugins/channelmimo/doa2/doa2.cpp

@ -694,3 +694,8 @@ double DOA2::normalizeAngle(double angle, double max) @@ -694,3 +694,8 @@ double DOA2::normalizeAngle(double angle, double max)
if (angle > max) { return angle - max; }
return angle;
}
int DOA2::getChannelSampleRate() const
{
return static_cast<int>(m_deviceSampleRate / (1 << m_settings.m_log2Decim));
}

1
plugins/channelmimo/doa2/doa2.h

@ -108,6 +108,7 @@ public: @@ -108,6 +108,7 @@ public:
QString getIdentifier() const final { return objectName(); }
void getTitle(QString& title) final { title = "DOA 2 sources"; }
qint64 getCenterFrequency() const final { return m_frequencyOffset; }
int getChannelSampleRate() const override;
void setCenterFrequency(qint64) final { /* Not for MIMO */ }
uint32_t getDeviceSampleRate() const { return m_deviceSampleRate; }

9
plugins/channelrx/chanalyzer/chanalyzer.cpp

@ -53,7 +53,7 @@ ChannelAnalyzer::ChannelAnalyzer(DeviceAPI *deviceAPI) : @@ -53,7 +53,7 @@ ChannelAnalyzer::ChannelAnalyzer(DeviceAPI *deviceAPI) :
{
qDebug("ChannelAnalyzer::ChannelAnalyzer");
setObjectName(m_channelId);
getChannelSampleRate();
getBasebandSampleRate();
m_basebandSink = new ChannelAnalyzerBaseband();
m_basebandSink->moveToThread(&m_thread);
@ -116,7 +116,7 @@ uint32_t ChannelAnalyzer::getNumberOfDeviceStreams() const @@ -116,7 +116,7 @@ uint32_t ChannelAnalyzer::getNumberOfDeviceStreams() const
return m_deviceAPI->getNbSourceStreams();
}
int ChannelAnalyzer::getChannelSampleRate()
int ChannelAnalyzer::getBasebandSampleRate()
{
DeviceSampleSource *source = m_deviceAPI->getSampleSource();
@ -724,3 +724,8 @@ void ChannelAnalyzer::handleIndexInDeviceSetChanged(int index) @@ -724,3 +724,8 @@ void ChannelAnalyzer::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int ChannelAnalyzer::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/chanalyzer/chanalyzer.h

@ -75,7 +75,7 @@ public: @@ -75,7 +75,7 @@ public:
SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
ScopeVis *getScopeVis() { return &m_scopeVis; }
void setScopeVis(ScopeVis *scopeVis) { m_basebandSink->setScopeVis(scopeVis); }
int getChannelSampleRate();
int getBasebandSampleRate(); //!< Updates and returns the device (baseband) sample rate
int getDecimation() const { return 1<<m_settings.m_log2Decim; }
double getMagSq() const { return m_basebandSink->getMagSq(); }
double getMagSqAvg() const { return m_basebandSink->getMagSqAvg(); }
@ -95,6 +95,7 @@ public: @@ -95,6 +95,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const { return QByteArray(); }

6
plugins/channelrx/chanalyzer/chanalyzergui.cpp

@ -313,7 +313,7 @@ void ChannelAnalyzerGUI::tick() @@ -313,7 +313,7 @@ void ChannelAnalyzerGUI::tick()
if (ui->pll->isChecked())
{
double sampleRate = (double) m_channelAnalyzer->getChannelSampleRate();
double sampleRate = (double) m_channelAnalyzer->getBasebandSampleRate();
int freq = (m_channelAnalyzer->getPllFrequency() * sampleRate) / (2.0*M_PI);
ui->pll->setToolTip(tr("PLL lock. Freq = %1 Hz").arg(freq));
ui->pllLockFrequency->setText(tr("%1 Hz").arg(freq));
@ -548,13 +548,13 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device @@ -548,13 +548,13 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(onMenuDialogCalled(const QPoint &)));
m_channelAnalyzer = (ChannelAnalyzer*) rxChannel;
m_basebandSampleRate = m_channelAnalyzer->getChannelSampleRate();
m_basebandSampleRate = m_channelAnalyzer->getBasebandSampleRate();
qDebug("ChannelAnalyzerGUI::ChannelAnalyzerGUI: m_basebandSampleRate: %d", m_basebandSampleRate);
m_spectrumVis = m_channelAnalyzer->getSpectrumVis();
m_spectrumVis->setGLSpectrum(ui->glSpectrum);
m_scopeVis = m_channelAnalyzer->getScopeVis();
m_scopeVis->setGLScope(ui->glScope);
m_basebandSampleRate = m_channelAnalyzer->getChannelSampleRate();
m_basebandSampleRate = m_channelAnalyzer->getBasebandSampleRate();
m_scopeVis->setSpectrumVis(m_spectrumVis);
m_channelAnalyzer->setScopeVis(m_scopeVis);
m_channelAnalyzer->setMessageQueueToGUI(getInputMessageQueue());

4
plugins/channelrx/channelpower/channelpower.cpp

@ -563,3 +563,7 @@ void ChannelPower::handleIndexInDeviceSetChanged(int index) @@ -563,3 +563,7 @@ void ChannelPower::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
}
int ChannelPower::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/channelpower/channelpower.h

@ -86,6 +86,7 @@ public: @@ -86,6 +86,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

5
plugins/channelrx/demodadsb/adsbdemod.cpp

@ -807,3 +807,8 @@ void ADSBDemod::handleIndexInDeviceSetChanged(int index) @@ -807,3 +807,8 @@ void ADSBDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int ADSBDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/demodadsb/adsbdemod.h

@ -129,6 +129,7 @@ public: @@ -129,6 +129,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

10
plugins/channelrx/demodais/aisdemod.cpp

@ -751,3 +751,13 @@ void AISDemod::handleIndexInDeviceSetChanged(int index) @@ -751,3 +751,13 @@ void AISDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int AISDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int AISDemod::getAudioSampleRate() const
{
return AISDemodSettings::AISDEMOD_CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demodais/aisdemod.h

@ -121,6 +121,8 @@ public: @@ -121,6 +121,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

6
plugins/channelrx/demodam/amdemod.cpp

@ -157,6 +157,7 @@ void AMDemod::stop() @@ -157,6 +157,7 @@ void AMDemod::stop()
m_running = false;
m_thread->quit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool AMDemod::handleMessage(const Message& cmd)
@ -717,3 +718,8 @@ void AMDemod::handleIndexInDeviceSetChanged(int index) @@ -717,3 +718,8 @@ void AMDemod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int AMDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demodam/amdemod.h

@ -84,6 +84,7 @@ public: @@ -84,6 +84,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -127,7 +128,7 @@ public: @@ -127,7 +128,7 @@ public:
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response);
uint32_t getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
double getMagSq() const { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getSquelchOpen() const { return m_running ? m_basebandSink->getSquelchOpen() : false; }
bool getPllLocked() const { return m_settings.m_pll && m_running && m_basebandSink->getPllLocked(); }

5
plugins/channelrx/demodatv/atvdemod.cpp

@ -209,3 +209,8 @@ void ATVDemod::handleIndexInDeviceSetChanged(int index) @@ -209,3 +209,8 @@ void ATVDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int ATVDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/demodatv/atvdemod.h

@ -80,6 +80,7 @@ public: @@ -80,6 +80,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const { return QByteArray(); }

6
plugins/channelrx/demodbfm/bfmdemod.cpp

@ -163,6 +163,7 @@ void BFMDemod::stop() @@ -163,6 +163,7 @@ void BFMDemod::stop()
m_running = false;
m_thread->quit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool BFMDemod::handleMessage(const Message& cmd)
@ -761,3 +762,8 @@ void BFMDemod::handleIndexInDeviceSetChanged(int index) @@ -761,3 +762,8 @@ void BFMDemod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int BFMDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demodbfm/bfmdemod.h

@ -91,6 +91,7 @@ public: @@ -91,6 +91,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -117,7 +118,7 @@ public: @@ -117,7 +118,7 @@ public:
Real getDemodAcc() const { return m_running ? m_basebandSink->getDemodAcc() : 0.0f; }
Real getDemodQua() const { return m_running ? m_basebandSink->getDemodQua() : 0.0f; }
Real getDemodFclk() const { return m_running ? m_basebandSink->getDemodFclk() : 0.0f; }
int getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
void getMagSqLevels(double& avg, double& peak, int& nbSamples) {
if (m_running) {

6
plugins/channelrx/demodchirpchat/chirpchatdemod.cpp

@ -183,6 +183,7 @@ void ChirpChatDemod::stop() @@ -183,6 +183,7 @@ void ChirpChatDemod::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
m_decoderThread->exit();
m_decoderThread->wait();
m_decoderThread = nullptr;
@ -1094,3 +1095,8 @@ void ChirpChatDemod::handleIndexInDeviceSetChanged(int index) @@ -1094,3 +1095,8 @@ void ChirpChatDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int ChirpChatDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/demodchirpchat/chirpchatdemod.h

@ -86,6 +86,7 @@ public: @@ -86,6 +86,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

5
plugins/channelrx/demoddab/dabdemod.cpp

@ -917,3 +917,8 @@ void DABDemod::handleIndexInDeviceSetChanged(int index) @@ -917,3 +917,8 @@ void DABDemod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int DABDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demoddab/dabdemod.h

@ -353,6 +353,7 @@ public: @@ -353,6 +353,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -403,7 +404,7 @@ public: @@ -403,7 +404,7 @@ public:
}
uint32_t getNumberOfDeviceStreams() const;
int getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); }
int getAudioSampleRate() const override { return m_basebandSink->getAudioSampleRate(); }
static const char * const m_channelIdURI;
static const char * const m_channelId;

5
plugins/channelrx/demoddatv/datvdemod.cpp

@ -723,3 +723,8 @@ void DATVDemod::handleIndexInDeviceSetChanged(int index) @@ -723,3 +723,8 @@ void DATVDemod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int DATVDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/demoddatv/datvdemod.h

@ -51,6 +51,7 @@ public: @@ -51,6 +51,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = objectName(); }
virtual qint64 getCenterFrequency() const { return m_settings.m_centerFrequency; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const { return QByteArray(); }

10
plugins/channelrx/demoddsc/dscdemod.cpp

@ -760,3 +760,13 @@ void DSCDemod::handleIndexInDeviceSetChanged(int index) @@ -760,3 +760,13 @@ void DSCDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int DSCDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int DSCDemod::getAudioSampleRate() const
{
return DSCDemodSettings::DSCDEMOD_CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demoddsc/dscdemod.h

@ -117,6 +117,8 @@ public: @@ -117,6 +117,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

7
plugins/channelrx/demoddsd/dsddemod.cpp

@ -61,6 +61,7 @@ const int DSDDemod::m_udpBlockSize = 512; @@ -61,6 +61,7 @@ const int DSDDemod::m_udpBlockSize = 512;
DSDDemod::DSDDemod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_basebandSink(nullptr),
m_running(false),
m_basebandSampleRate(0),
m_centerFrequency(0),
@ -202,6 +203,7 @@ void DSDDemod::stop() @@ -202,6 +203,7 @@ void DSDDemod::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
void DSDDemod::setScopeXYSink(BasebandSampleSink* sampleSink)
@ -920,3 +922,8 @@ void DSDDemod::handleFeatureRemoved(int featureSetIndex, Feature *feature) @@ -920,3 +922,8 @@ void DSDDemod::handleFeatureRemoved(int featureSetIndex, Feature *feature)
notifyUpdateAMBEFeatures();
}
}
int DSDDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demoddsd/dsddemod.h

@ -117,6 +117,7 @@ public: @@ -117,6 +117,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -177,7 +178,7 @@ public: @@ -177,7 +178,7 @@ public:
}
const char *updateAndGetStatusText() { return m_running ? m_basebandSink->updateAndGetStatusText() : nullptr; }
int getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
bool isRunning() { return m_running; }
static const char* const m_channelIdURI;

10
plugins/channelrx/demodendoftrain/endoftraindemod.cpp

@ -699,3 +699,13 @@ void EndOfTrainDemod::handleIndexInDeviceSetChanged(int index) @@ -699,3 +699,13 @@ void EndOfTrainDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int EndOfTrainDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int EndOfTrainDemod::getAudioSampleRate() const
{
return EndOfTrainDemodSettings::CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demodendoftrain/endoftraindemod.h

@ -88,6 +88,8 @@ public: @@ -88,6 +88,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

5
plugins/channelrx/demodfreedv/freedvdemod.cpp

@ -655,3 +655,8 @@ void FreeDVDemod::handleIndexInDeviceSetChanged(int index) @@ -655,3 +655,8 @@ void FreeDVDemod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int FreeDVDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demodfreedv/freedvdemod.h

@ -98,6 +98,7 @@ public: @@ -98,6 +98,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -114,7 +115,7 @@ public: @@ -114,7 +115,7 @@ public:
return m_settings.m_inputFrequencyOffset;
}
int getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); }
int getAudioSampleRate() const override { return m_basebandSink->getAudioSampleRate(); }
uint32_t getModemSampleRate() const { return m_basebandSink->getModemSampleRate(); }
double getMagSq() const { return m_basebandSink->getMagSq(); }
bool getAudioActive() const { return m_basebandSink->getAudioActive(); }

7
plugins/channelrx/demodft8/ft8demod.cpp

@ -56,6 +56,7 @@ const char* const FT8Demod::m_channelId = "FT8Demod"; @@ -56,6 +56,7 @@ const char* const FT8Demod::m_channelId = "FT8Demod";
FT8Demod::FT8Demod(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_basebandSink(nullptr),
m_running(false),
m_spectrumVis(SDR_RX_SCALEF),
m_basebandSampleRate(0),
@ -205,6 +206,7 @@ void FT8Demod::stop() @@ -205,6 +206,7 @@ void FT8Demod::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool FT8Demod::handleMessage(const Message& cmd)
@ -859,3 +861,8 @@ void FT8Demod::handleIndexInDeviceSetChanged(int index) @@ -859,3 +861,8 @@ void FT8Demod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int FT8Demod::getAudioSampleRate() const
{
return FT8DemodSettings::m_ft8SampleRate;
}

3
plugins/channelrx/demodft8/ft8demod.h

@ -88,6 +88,7 @@ public: @@ -88,6 +88,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -106,7 +107,7 @@ public: @@ -106,7 +107,7 @@ public:
void setDeviceCenterFrequency(qint64 centerFrequency, int index);
void setMessageQueueToGUI(MessageQueue* queue) final;
uint32_t getChannelSampleRate() const { return m_running ? m_basebandSink->getChannelSampleRate() : 0; }
int getChannelSampleRate() const override { return m_running ? m_basebandSink->getChannelSampleRate() : 0; }
double getMagSq() const { return m_running ? m_basebandSink->getMagSq() : 0.0; }
void getMagSqLevels(double& avg, double& peak, int& nbSamples)

5
plugins/channelrx/demodils/ilsdemod.cpp

@ -918,3 +918,8 @@ void ILSDemod::handleIndexInDeviceSetChanged(int index) @@ -918,3 +918,8 @@ void ILSDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int ILSDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demodils/ilsdemod.h

@ -130,6 +130,7 @@ public: @@ -130,6 +130,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -175,7 +176,7 @@ public: @@ -175,7 +176,7 @@ public:
SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
ScopeVis *getScopeSink();
uint32_t getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
bool getSquelchOpen() const { return m_running ? m_basebandSink->getSquelchOpen() : false; }
double getMagSq() const { return m_basebandSink->getMagSq(); }

10
plugins/channelrx/demodinmarsat/inmarsatdemod.cpp

@ -693,3 +693,13 @@ void InmarsatDemod::handleIndexInDeviceSetChanged(int index) @@ -693,3 +693,13 @@ void InmarsatDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int InmarsatDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int InmarsatDemod::getAudioSampleRate() const
{
return InmarsatDemodSettings::CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demodinmarsat/inmarsatdemod.h

@ -86,6 +86,8 @@ public: @@ -86,6 +86,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

6
plugins/channelrx/demodm17/m17demod.cpp

@ -165,6 +165,7 @@ void M17Demod::stop() @@ -165,6 +165,7 @@ void M17Demod::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool M17Demod::handleMessage(const Message& cmd)
@ -761,3 +762,8 @@ void M17Demod::setScopeXYSink(BasebandSampleSink* sampleSink) @@ -761,3 +762,8 @@ void M17Demod::setScopeXYSink(BasebandSampleSink* sampleSink)
m_basebandSink->setScopeXYSink(sampleSink);
}
}
int M17Demod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demodm17/m17demod.h

@ -170,6 +170,7 @@ public: @@ -170,6 +170,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -228,7 +229,7 @@ public: @@ -228,7 +229,7 @@ public:
}
}
int getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
bool isRunning() { return m_running; }
void getDiagnostics(

5
plugins/channelrx/demodmeshcore/meshcoredemod.cpp

@ -1753,3 +1753,8 @@ void MeshcoreDemod::handleIndexInDeviceSetChanged(int index) @@ -1753,3 +1753,8 @@ void MeshcoreDemod::handleIndexInDeviceSetChanged(int index)
runtime.basebandSink->setFifoLabel(fifoLabel);
}
}
int MeshcoreDemod::getChannelSampleRate() const
{
return m_pipelines.empty() || !m_pipelines[0].basebandSink ? 0 : m_pipelines[0].basebandSink->getChannelSampleRate();
}

1
plugins/channelrx/demodmeshcore/meshcoredemod.h

@ -106,6 +106,7 @@ public: @@ -106,6 +106,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

5
plugins/channelrx/demodmeshtastic/meshtasticdemod.cpp

@ -1683,3 +1683,8 @@ void MeshtasticDemod::handleIndexInDeviceSetChanged(int index) @@ -1683,3 +1683,8 @@ void MeshtasticDemod::handleIndexInDeviceSetChanged(int index)
runtime.basebandSink->setFifoLabel(fifoLabel);
}
}
int MeshtasticDemod::getChannelSampleRate() const
{
return m_pipelines.empty() || !m_pipelines[0].basebandSink ? 0 : m_pipelines[0].basebandSink->getChannelSampleRate();
}

1
plugins/channelrx/demodmeshtastic/meshtasticdemod.h

@ -106,6 +106,7 @@ public: @@ -106,6 +106,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

10
plugins/channelrx/demodnavtex/navtexdemod.cpp

@ -749,3 +749,13 @@ void NavtexDemod::handleIndexInDeviceSetChanged(int index) @@ -749,3 +749,13 @@ void NavtexDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int NavtexDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int NavtexDemod::getAudioSampleRate() const
{
return NavtexDemodSettings::NAVTEXDEMOD_CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demodnavtex/navtexdemod.h

@ -137,6 +137,8 @@ public: @@ -137,6 +137,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

6
plugins/channelrx/demodnfm/nfmdemod.cpp

@ -173,6 +173,7 @@ void NFMDemod::stop() @@ -173,6 +173,7 @@ void NFMDemod::stop()
m_running = false;
m_thread->quit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool NFMDemod::handleMessage(const Message& cmd)
@ -721,3 +722,8 @@ void NFMDemod::handleIndexInDeviceSetChanged(int index) @@ -721,3 +722,8 @@ void NFMDemod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int NFMDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demodnfm/nfmdemod.h

@ -84,6 +84,7 @@ public: @@ -84,6 +84,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -138,7 +139,7 @@ public: @@ -138,7 +139,7 @@ public:
}
}
int getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
uint32_t getNumberOfDeviceStreams() const;

10
plugins/channelrx/demodpacket/packetdemod.cpp

@ -715,3 +715,13 @@ void PacketDemod::handleIndexInDeviceSetChanged(int index) @@ -715,3 +715,13 @@ void PacketDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int PacketDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int PacketDemod::getAudioSampleRate() const
{
return PacketDemodSettings::PACKETDEMOD_CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demodpacket/packetdemod.h

@ -89,6 +89,8 @@ public: @@ -89,6 +89,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

10
plugins/channelrx/demodpager/pagerdemod.cpp

@ -723,3 +723,13 @@ void PagerDemod::handleIndexInDeviceSetChanged(int index) @@ -723,3 +723,13 @@ void PagerDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int PagerDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int PagerDemod::getAudioSampleRate() const
{
return PagerDemodSettings::m_channelSampleRate;
}

2
plugins/channelrx/demodpager/pagerdemod.h

@ -149,6 +149,8 @@ public: @@ -149,6 +149,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

10
plugins/channelrx/demodradiosonde/radiosondedemod.cpp

@ -767,3 +767,13 @@ void RadiosondeDemod::handleIndexInDeviceSetChanged(int index) @@ -767,3 +767,13 @@ void RadiosondeDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int RadiosondeDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int RadiosondeDemod::getAudioSampleRate() const
{
return RadiosondeDemodSettings::RADIOSONDEDEMOD_CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demodradiosonde/radiosondedemod.h

@ -124,6 +124,8 @@ public: @@ -124,6 +124,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

10
plugins/channelrx/demodrtty/rttydemod.cpp

@ -794,3 +794,13 @@ void RttyDemod::handleIndexInDeviceSetChanged(int index) @@ -794,3 +794,13 @@ void RttyDemod::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int RttyDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}
int RttyDemod::getAudioSampleRate() const
{
return RttyDemodSettings::RTTYDEMOD_CHANNEL_SAMPLE_RATE;
}

2
plugins/channelrx/demodrtty/rttydemod.h

@ -131,6 +131,8 @@ public: @@ -131,6 +131,8 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

1
plugins/channelrx/demodssb/ssbdemod.cpp

@ -190,6 +190,7 @@ void SSBDemod::stop() @@ -190,6 +190,7 @@ void SSBDemod::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool SSBDemod::handleMessage(const Message& cmd)

4
plugins/channelrx/demodssb/ssbdemod.h

@ -105,8 +105,8 @@ public: @@ -105,8 +105,8 @@ public:
}
void setMessageQueueToGUI(MessageQueue* queue) final;
uint32_t getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
uint32_t getChannelSampleRate() const { return m_running ? m_basebandSink->getChannelSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getChannelSampleRate() const override { return m_running ? m_basebandSink->getChannelSampleRate() : 0; }
double getMagSq() const { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getAudioActive() const { return m_running && m_basebandSink->getAudioActive(); }

1
plugins/channelrx/demodvor/vordemod.cpp

@ -164,6 +164,7 @@ void VORDemod::stop() @@ -164,6 +164,7 @@ void VORDemod::stop()
m_basebandSink->stopWork();
m_thread->quit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool VORDemod::handleMessage(const Message& cmd)

2
plugins/channelrx/demodvor/vordemod.h

@ -129,7 +129,7 @@ public: @@ -129,7 +129,7 @@ public:
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response);
uint32_t getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
double getMagSq() const { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getSquelchOpen() const { return m_running ? m_basebandSink->getSquelchOpen() : false; }

2
plugins/channelrx/demodvormc/vordemodmc.h

@ -118,7 +118,7 @@ public: @@ -118,7 +118,7 @@ public:
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response);
uint32_t getAudioSampleRate() const { return m_basebandSink->getAudioSampleRate(); }
int getAudioSampleRate() const override { return m_basebandSink->getAudioSampleRate(); }
double getMagSq() const { return m_basebandSink->getMagSq(); }
bool getSquelchOpen() const { return m_basebandSink->getSquelchOpen(); }

6
plugins/channelrx/demodwfm/wfmdemod.cpp

@ -161,6 +161,7 @@ void WFMDemod::stop() @@ -161,6 +161,7 @@ void WFMDemod::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool WFMDemod::handleMessage(const Message& cmd)
@ -662,3 +663,8 @@ void WFMDemod::handleIndexInDeviceSetChanged(int index) @@ -662,3 +663,8 @@ void WFMDemod::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int WFMDemod::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

3
plugins/channelrx/demodwfm/wfmdemod.h

@ -84,6 +84,7 @@ public: @@ -84,6 +84,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -102,7 +103,7 @@ public: @@ -102,7 +103,7 @@ public:
double getMagSq() const { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getSquelchOpen() const { return m_running && m_basebandSink->getSquelchOpen(); }
int getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
QDateTime getAudioFifoErrorDateTime() const { return m_running ? m_basebandSink->getAudioFifoErrorDateTime() : QDateTime(); }
void getMagSqLevels(double& avg, double& peak, int& nbSamples)

7
plugins/channelrx/filesink/filesink.cpp

@ -54,6 +54,7 @@ const char* const FileSink::m_channelId = "FileSink"; @@ -54,6 +54,7 @@ const char* const FileSink::m_channelId = "FileSink";
FileSink::FileSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_basebandSink(nullptr),
m_running(false),
m_spectrumVis(SDR_RX_SCALEF),
m_centerFrequency(0),
@ -206,6 +207,7 @@ void FileSink::stop() @@ -206,6 +207,7 @@ void FileSink::stop()
m_thread->quit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
if (getMessageQueueToGUI())
{
@ -833,3 +835,8 @@ void FileSink::handleIndexInDeviceSetChanged(int index) @@ -833,3 +835,8 @@ void FileSink::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int FileSink::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/filesink/filesink.h

@ -103,6 +103,7 @@ public: @@ -103,6 +103,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = "File Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64) {}
virtual QByteArray serialize() const;

6
plugins/channelrx/freqscanner/freqscanner.cpp

@ -201,6 +201,7 @@ void FreqScanner::stop() @@ -201,6 +201,7 @@ void FreqScanner::stop()
m_thread->exit();
#ifndef __EMSCRIPTEN__
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
#endif
}
@ -1455,3 +1456,8 @@ void FreqScanner::notifyUpdateChannels(const QStringList& renameFrom, const QStr @@ -1455,3 +1456,8 @@ void FreqScanner::notifyUpdateChannels(const QStringList& renameFrom, const QStr
getMessageQueueToGUI()->push(msgToGUI);
}
}
int FreqScanner::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/freqscanner/freqscanner.h

@ -325,6 +325,7 @@ public: @@ -325,6 +325,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

6
plugins/channelrx/freqtracker/freqtracker.cpp

@ -160,6 +160,7 @@ void FreqTracker::stop() @@ -160,6 +160,7 @@ void FreqTracker::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool FreqTracker::handleMessage(const Message& cmd)
@ -708,3 +709,8 @@ void FreqTracker::handleIndexInDeviceSetChanged(int index) @@ -708,3 +709,8 @@ void FreqTracker::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int FreqTracker::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/freqtracker/freqtracker.h

@ -84,6 +84,7 @@ public: @@ -84,6 +84,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

5
plugins/channelrx/heatmap/heatmap.cpp

@ -599,3 +599,8 @@ void HeatMap::handleIndexInDeviceSetChanged(int index) @@ -599,3 +599,8 @@ void HeatMap::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int HeatMap::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/heatmap/heatmap.h

@ -91,6 +91,7 @@ public: @@ -91,6 +91,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

6
plugins/channelrx/localsink/localsink.cpp

@ -185,6 +185,7 @@ void LocalSink::stopProcessing() @@ -185,6 +185,7 @@ void LocalSink::stopProcessing()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool LocalSink::handleMessage(const Message& cmd)
@ -861,3 +862,8 @@ void LocalSink::updateDeviceSetList() @@ -861,3 +862,8 @@ void LocalSink::updateDeviceSetList()
m_guiMessageQueue->push(msg);
}
}
int LocalSink::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/localsink/localsink.h

@ -101,6 +101,7 @@ public: @@ -101,6 +101,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = "Local Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64) {}
virtual QByteArray serialize() const;

5
plugins/channelrx/noisefigure/noisefigure.cpp

@ -977,3 +977,8 @@ void NoiseFigure::handleIndexInDeviceSetChanged(int index) @@ -977,3 +977,8 @@ void NoiseFigure::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int NoiseFigure::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/noisefigure/noisefigure.h

@ -194,6 +194,7 @@ public: @@ -194,6 +194,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

5
plugins/channelrx/radioastronomy/radioastronomy.cpp

@ -1357,3 +1357,8 @@ void RadioAstronomy::handleFeatureMessageQueue(MessageQueue* messageQueue) @@ -1357,3 +1357,8 @@ void RadioAstronomy::handleFeatureMessageQueue(MessageQueue* messageQueue)
}
}
}
int RadioAstronomy::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/radioastronomy/radioastronomy.h

@ -396,6 +396,7 @@ public: @@ -396,6 +396,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

5
plugins/channelrx/radioclock/radioclock.cpp

@ -628,3 +628,8 @@ void RadioClock::handleIndexInDeviceSetChanged(int index) @@ -628,3 +628,8 @@ void RadioClock::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int RadioClock::getChannelSampleRate() const
{
return RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE;
}

1
plugins/channelrx/radioclock/radioclock.h

@ -134,6 +134,7 @@ public: @@ -134,6 +134,7 @@ public:
virtual const QString& getURI() const { return getName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

6
plugins/channelrx/remotesink/remotesink.cpp

@ -162,6 +162,7 @@ void RemoteSink::stop() @@ -162,6 +162,7 @@ void RemoteSink::stop()
m_basebandSink->stopWork();
m_thread->quit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool RemoteSink::handleMessage(const Message& cmd)
@ -705,3 +706,8 @@ void RemoteSink::handleIndexInDeviceSetChanged(int index) @@ -705,3 +706,8 @@ void RemoteSink::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int RemoteSink::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/remotesink/remotesink.h

@ -83,6 +83,7 @@ public: @@ -83,6 +83,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = "Remote Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64) {}
virtual QByteArray serialize() const;

5
plugins/channelrx/remotetcpsink/remotetcpsink.cpp

@ -764,3 +764,8 @@ void RemoteTCPSink::updatePublicListing() @@ -764,3 +764,8 @@ void RemoteTCPSink::updatePublicListing()
m_networkManager->post(request, data);
}
int RemoteTCPSink::getChannelSampleRate() const
{
return m_settings.m_channelSampleRate;
}

1
plugins/channelrx/remotetcpsink/remotetcpsink.h

@ -221,6 +221,7 @@ public: @@ -221,6 +221,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = "Remote Sink"; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

7
plugins/channelrx/sigmffilesink/sigmffilesink.cpp

@ -54,6 +54,7 @@ const char* const SigMFFileSink::m_channelId = "SigMFFileSink"; @@ -54,6 +54,7 @@ const char* const SigMFFileSink::m_channelId = "SigMFFileSink";
SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_basebandSink(nullptr),
m_running(false),
m_spectrumVis(SDR_RX_SCALEF),
m_centerFrequency(0),
@ -204,6 +205,7 @@ void SigMFFileSink::stop() @@ -204,6 +205,7 @@ void SigMFFileSink::stop()
m_running = false;
m_thread->quit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
if (getMessageQueueToGUI())
{
@ -838,3 +840,8 @@ void SigMFFileSink::handleIndexInDeviceSetChanged(int index) @@ -838,3 +840,8 @@ void SigMFFileSink::handleIndexInDeviceSetChanged(int index)
.arg(index);
m_basebandSink->setFifoLabel(fifoLabel);
}
int SigMFFileSink::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/sigmffilesink/sigmffilesink.h

@ -103,6 +103,7 @@ public: @@ -103,6 +103,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = "SigMF File Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64) {}
virtual QByteArray serialize() const;

5
plugins/channelrx/udpsink/udpsink.cpp

@ -695,3 +695,8 @@ void UDPSink::handleIndexInDeviceSetChanged(int index) @@ -695,3 +695,8 @@ void UDPSink::handleIndexInDeviceSetChanged(int index)
m_basebandSink->setFifoLabel(fifoLabel);
m_basebandSink->setAudioFifoLabel(fifoLabel);
}
int UDPSink::getChannelSampleRate() const
{
return m_basebandSink ? m_basebandSink->getChannelSampleRate() : 0;
}

1
plugins/channelrx/udpsink/udpsink.h

@ -90,6 +90,7 @@ public: @@ -90,6 +90,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

1
plugins/channelrx/wdsprx/wdsprx.cpp

@ -192,6 +192,7 @@ void WDSPRx::stop() @@ -192,6 +192,7 @@ void WDSPRx::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSink = nullptr; // Freed by deleteLater when the thread finished
}
bool WDSPRx::handleMessage(const Message& cmd)

4
plugins/channelrx/wdsprx/wdsprx.h

@ -105,8 +105,8 @@ public: @@ -105,8 +105,8 @@ public:
}
void setMessageQueueToGUI(MessageQueue* queue) final;
uint32_t getAudioSampleRate() const { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
uint32_t getChannelSampleRate() const { return m_running ? m_basebandSink->getChannelSampleRate() : 0; }
int getAudioSampleRate() const override { return m_running ? m_basebandSink->getAudioSampleRate() : 0; }
int getChannelSampleRate() const override { return m_running ? m_basebandSink->getChannelSampleRate() : 0; }
double getMagSq() const { return m_running ? m_basebandSink->getMagSq() : 0.0; }
bool getAudioActive() const { return m_running && m_basebandSink->getAudioActive(); }

5
plugins/channeltx/filesource/filesource.cpp

@ -701,3 +701,8 @@ uint32_t FileSource::getNumberOfDeviceStreams() const @@ -701,3 +701,8 @@ uint32_t FileSource::getNumberOfDeviceStreams() const
{
return m_deviceAPI->getNbSinkStreams();
}
int FileSource::getChannelSampleRate() const
{
return m_basebandSource ? m_basebandSource->getChannelSampleRate() : 0;
}

1
plugins/channeltx/filesource/filesource.h

@ -166,6 +166,7 @@ public: @@ -166,6 +166,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return 0; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64) {}
virtual int getNbSinkStreams() const { return 0; }

5
plugins/channeltx/localsource/localsource.cpp

@ -627,3 +627,8 @@ uint32_t LocalSource::getNumberOfDeviceStreams() const @@ -627,3 +627,8 @@ uint32_t LocalSource::getNumberOfDeviceStreams() const
{
return m_deviceAPI->getNbSinkStreams();
}
int LocalSource::getChannelSampleRate() const
{
return m_basebandSource ? m_basebandSource->getChannelSampleRate() : 0;
}

1
plugins/channeltx/localsource/localsource.h

@ -80,6 +80,7 @@ public: @@ -80,6 +80,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = "Local Sink"; }
virtual qint64 getCenterFrequency() const { return m_frequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64) {}
virtual QByteArray serialize() const;

5
plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp

@ -813,3 +813,8 @@ ScopeVis *IEEE_802_15_4_Mod::getScopeSink() @@ -813,3 +813,8 @@ ScopeVis *IEEE_802_15_4_Mod::getScopeSink()
{
return m_basebandSource->getScopeSink();
}
int IEEE_802_15_4_Mod::getChannelSampleRate() const
{
return m_basebandSource ? m_basebandSource->getChannelSampleRate() : 0;
}

1
plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.h

@ -109,6 +109,7 @@ public: @@ -109,6 +109,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

10
plugins/channeltx/modais/aismod.cpp

@ -996,3 +996,13 @@ void AISMod::udpRx() @@ -996,3 +996,13 @@ void AISMod::udpRx()
m_basebandSource->getInputMessageQueue()->push(msg);
}
}
int AISMod::getChannelSampleRate() const
{
return m_basebandSource ? m_basebandSource->getChannelSampleRate() : 0;
}
int AISMod::getAudioSampleRate() const
{
return AISModSettings::AISMOD_SAMPLE_RATE;
}

2
plugins/channeltx/modais/aismod.h

@ -170,6 +170,8 @@ public: @@ -170,6 +170,8 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
int getAudioSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

6
plugins/channeltx/modam/ammod.cpp

@ -161,6 +161,7 @@ void AMMod::stop() @@ -161,6 +161,7 @@ void AMMod::stop()
m_running = false;
m_thread->exit();
m_thread->wait();
m_basebandSource = nullptr; // Freed by deleteLater when the thread finished
}
void AMMod::pull(SampleVector::iterator& begin, unsigned int nbSamples)
@ -836,3 +837,8 @@ int AMMod::getFeedbackAudioSampleRate() const @@ -836,3 +837,8 @@ int AMMod::getFeedbackAudioSampleRate() const
return 0;
}
int AMMod::getChannelSampleRate() const
{
return m_basebandSource ? m_basebandSource->getChannelSampleRate() : 0;
}

3
plugins/channeltx/modam/ammod.h

@ -193,6 +193,7 @@ public: @@ -193,6 +193,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;
@ -240,7 +241,7 @@ public: @@ -240,7 +241,7 @@ public:
double getMagSq() const;
CWKeyer *getCWKeyer();
void setLevelMeter(QObject *levelMeter) { m_levelMeter = levelMeter; }
int getAudioSampleRate() const;
int getAudioSampleRate() const override;
int getFeedbackAudioSampleRate() const;
static const char* const m_channelIdURI;

5
plugins/channeltx/modatv/atvmod.cpp

@ -800,3 +800,8 @@ void ATVMod::setMessageQueueToGUI(MessageQueue* queue) { @@ -800,3 +800,8 @@ void ATVMod::setMessageQueueToGUI(MessageQueue* queue) {
ChannelAPI::setMessageQueueToGUI(queue);
m_basebandSource->setMessageQueueToGUI(queue);
}
int ATVMod::getChannelSampleRate() const
{
return m_basebandSource ? m_basebandSource->getChannelSampleRate() : 0;
}

1
plugins/channeltx/modatv/atvmod.h

@ -263,6 +263,7 @@ public: @@ -263,6 +263,7 @@ public:
virtual QString getIdentifier() const { return objectName(); }
virtual void getTitle(QString& title) { title = m_settings.m_title; }
virtual qint64 getCenterFrequency() const { return m_settings.m_inputFrequencyOffset; }
int getChannelSampleRate() const override;
virtual void setCenterFrequency(qint64 frequency);
virtual QByteArray serialize() const;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save