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

WFM modulator: fixed tone frequency and apply channel settings output sample rate handling

pull/127/head
f4exb 2018-01-02 12:32:22 +01:00
rodzic 23e5ef76d4
commit 018c8ade40
1 zmienionych plików z 4 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
plugins/channeltx/modwfm/wfmmod.cpp
Wyświetl plik

@ -424,11 +424,11 @@ void WFMMod::applyChannelSettings(int basebandSampleRate, int outputSampleRate,
m_interpolatorConsumed = false;
m_interpolatorDistance = (Real) m_settings.m_audioSampleRate / (Real) outputSampleRate;
m_interpolator.create(48, m_settings.m_audioSampleRate, m_settings.m_rfBandwidth / 2.2, 3.0);
Real lowCut = -(m_settings.m_rfBandwidth / 2.0) / m_outputSampleRate;
Real hiCut = (m_settings.m_rfBandwidth / 2.0) / m_outputSampleRate;
Real lowCut = -(m_settings.m_rfBandwidth / 2.0) / outputSampleRate;
Real hiCut = (m_settings.m_rfBandwidth / 2.0) / outputSampleRate;
m_rfFilter->create_filter(lowCut, hiCut);
m_toneNcoRF.setFreq(m_settings.m_toneFrequency, m_outputSampleRate);
m_cwKeyer.setSampleRate(m_outputSampleRate);
m_toneNcoRF.setFreq(m_settings.m_toneFrequency, outputSampleRate);
m_cwKeyer.setSampleRate(outputSampleRate);
m_cwKeyer.reset();
m_settingsMutex.unlock();
}
@ -471,14 +471,6 @@ void WFMMod::applySettings(const WFMModSettings& settings, bool force)
m_settingsMutex.unlock();
}
if ((settings.m_toneFrequency != m_settings.m_toneFrequency) ||
(settings.m_audioSampleRate != m_settings.m_audioSampleRate) || force)
{
m_settingsMutex.lock();
m_toneNco.setFreq(settings.m_toneFrequency, settings.m_audioSampleRate);
m_settingsMutex.unlock();
}
if ((settings.m_toneFrequency != m_settings.m_toneFrequency) || force)
{
m_settingsMutex.lock();