mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Demods with audio: systematically reapply audio sample rate in case of channel sample rate change

pull/588/head
f4exb 2020-08-02 10:10:26 +02:00
rodzic b747966c8e
commit 7917d595f5
8 zmienionych plików z 22 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
plugins/channelrx/demodam/amdemodbaseband.cpp
Wyświetl plik

@ -143,6 +143,7 @@ bool AMDemodBaseband::handleMessage(const Message& cmd)
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(notif.getSampleRate()));
m_channelizer->setBasebandSampleRate(notif.getSampleRate());
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
return true;
}
@ -158,6 +159,7 @@ void AMDemodBaseband::applySettings(const AMDemodSettings& settings, bool force)
{
m_channelizer->setChannelization(m_sink.getAudioSampleRate(), settings.m_inputFrequencyOffset);
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
}
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)

2
plugins/channelrx/demodbfm/bfmdemodbaseband.cpp
Wyświetl plik

@ -124,6 +124,7 @@ bool BFMDemodBaseband::handleMessage(const Message& cmd)
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(notif.getSampleRate()));
m_channelizer->setBasebandSampleRate(notif.getSampleRate());
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
if (getMessageQueueToGUI())
{
@ -146,6 +147,7 @@ void BFMDemodBaseband::applySettings(const BFMDemodSettings& settings, bool forc
{
m_channelizer->setChannelization(BFMDemodSettings::requiredBW(settings.m_rfBandwidth), settings.m_inputFrequencyOffset);
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
if (getMessageQueueToGUI())
{

2
plugins/channelrx/demoddsd/dsddemodbaseband.cpp
Wyświetl plik

@ -125,6 +125,7 @@ bool DSDDemodBaseband::handleMessage(const Message& cmd)
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(notif.getSampleRate()));
m_channelizer->setBasebandSampleRate(notif.getSampleRate());
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
return true;
}
@ -140,6 +141,7 @@ void DSDDemodBaseband::applySettings(const DSDDemodSettings& settings, bool forc
{
m_channelizer->setChannelization(m_sink.getAudioSampleRate(), settings.m_inputFrequencyOffset);
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
}
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)

2
plugins/channelrx/demodnfm/nfmdemodbaseband.cpp
Wyświetl plik

@ -122,6 +122,7 @@ bool NFMDemodBaseband::handleMessage(const Message& cmd)
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(notif.getSampleRate()));
m_channelizer->setBasebandSampleRate(notif.getSampleRate());
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
return true;
}
@ -137,6 +138,7 @@ void NFMDemodBaseband::applySettings(const NFMDemodSettings& settings, bool forc
{
m_channelizer->setChannelization(m_sink.getAudioSampleRate(), settings.m_inputFrequencyOffset);
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
}
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)

2
plugins/channelrx/demodssb/ssbdemodbaseband.cpp
Wyświetl plik

@ -125,6 +125,7 @@ bool SSBDemodBaseband::handleMessage(const Message& cmd)
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(notif.getSampleRate()));
m_channelizer->setBasebandSampleRate(notif.getSampleRate());
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_audioSampleRate); // reapply in case of channel sample rate change
return true;
}
@ -140,6 +141,7 @@ void SSBDemodBaseband::applySettings(const SSBDemodSettings& settings, bool forc
{
m_channelizer->setChannelization(m_audioSampleRate, settings.m_inputFrequencyOffset);
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_audioSampleRate); // reapply in case of channel sample rate change
}
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)

13
plugins/channelrx/demodssb/ssbdemodgui.cpp
Wyświetl plik

@ -300,7 +300,8 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_audioBinaural(false),
m_audioFlipChannels(false),
m_audioMute(false),
m_squelchOpen(false)
m_squelchOpen(false),
m_audioSampleRate(-1)
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
@ -661,17 +662,21 @@ void SSBDemodGUI::tick()
ui->channelPower->setText(tr("%1 dB").arg(powDbAvg, 0, 'f', 1));
}
int audioSampleRate = m_ssbDemod->getAudioSampleRate();
bool squelchOpen = m_ssbDemod->getAudioActive();
if (squelchOpen != m_squelchOpen)
if ((audioSampleRate != m_audioSampleRate) || (squelchOpen != m_squelchOpen))
{
if (squelchOpen) {
if (audioSampleRate < 0) {
ui->audioMute->setStyleSheet("QToolButton { background-color : red; }");
} else if (squelchOpen) {
ui->audioMute->setStyleSheet("QToolButton { background-color : green; }");
} else {
ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
}
m_squelchOpen = squelchOpen;
m_audioSampleRate = audioSampleRate;
m_squelchOpen = squelchOpen;
}
m_tickCount++;

1
plugins/channelrx/demodssb/ssbdemodgui.h
Wyświetl plik

@ -56,6 +56,7 @@ private:
bool m_audioFlipChannels;
bool m_audioMute;
bool m_squelchOpen;
int m_audioSampleRate;
uint32_t m_tickCount;
SSBDemod* m_ssbDemod;

2
plugins/channelrx/demodwfm/wfmdemodbaseband.cpp
Wyświetl plik

@ -122,6 +122,7 @@ bool WFMDemodBaseband::handleMessage(const Message& cmd)
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(notif.getSampleRate()));
m_channelizer->setBasebandSampleRate(notif.getSampleRate());
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
return true;
}
@ -138,6 +139,7 @@ void WFMDemodBaseband::applySettings(const WFMDemodSettings& settings, bool forc
{
m_channelizer->setChannelization(WFMDemodSettings::requiredBW(settings.m_rfBandwidth), settings.m_inputFrequencyOffset);
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
m_sink.applyAudioSampleRate(m_sink.getAudioSampleRate()); // reapply in case of channel sample rate change
}
if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force)