VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-14 12:22:00 -05:00
Code Issues Projects Releases Wiki Activity

CW smoother: set default ramp time to 4ms and set the modulators ramp time at the same value

Browse Source
This commit is contained in:
f4exb 2016-12-16 00:02:37 +01:00
parent 5571e01a65
commit 014ada12ba
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/channeltx/modam/ammod.cpp
View File

@ -71,7 +71,7 @@ AMMod::AMMod() :
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwKeyer.setWPM(13); m_cwKeyer.setWPM(13);
m_cwKeyer.setMode(CWKeyer::CWNone); m_cwKeyer.setMode(CWKeyer::CWNone);
m_cwSmoother.setNbFadeSamples(96); // 2 ms @ 48 kHz m_cwSmoother.setNbFadeSamples(192); // 4 ms @ 48 kHz
} }
AMMod::~AMMod() AMMod::~AMMod()
@ -359,7 +359,7 @@ void AMMod::apply()
if (m_config.m_audioSampleRate != m_running.m_audioSampleRate) if (m_config.m_audioSampleRate != m_running.m_audioSampleRate)
{ {
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 500); // 2 ms m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
} }
m_running.m_outputSampleRate = m_config.m_outputSampleRate; m_running.m_outputSampleRate = m_config.m_outputSampleRate;

4
plugins/channeltx/modnfm/nfmmod.cpp
View File

@ -73,7 +73,7 @@ NFMMod::NFMMod() :
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwKeyer.setWPM(13); m_cwKeyer.setWPM(13);
m_cwKeyer.setMode(CWKeyer::CWNone); m_cwKeyer.setMode(CWKeyer::CWNone);
m_cwSmoother.setNbFadeSamples(96); // 2 ms @ 48 kHz m_cwSmoother.setNbFadeSamples(192); // 2 ms @ 48 kHz
} }
NFMMod::~NFMMod() NFMMod::~NFMMod()
@ -377,7 +377,7 @@ void NFMMod::apply()
if (m_config.m_audioSampleRate != m_running.m_audioSampleRate) if (m_config.m_audioSampleRate != m_running.m_audioSampleRate)
{ {
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 500); // 2 ms m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
} }
m_running.m_outputSampleRate = m_config.m_outputSampleRate; m_running.m_outputSampleRate = m_config.m_outputSampleRate;

4
plugins/channeltx/modssb/ssbmod.cpp
View File

@ -93,7 +93,7 @@ SSBMod::SSBMod(BasebandSampleSink* sampleSink) :
m_cwKeyer.setWPM(13); m_cwKeyer.setWPM(13);
m_cwKeyer.setMode(CWKeyer::CWNone); m_cwKeyer.setMode(CWKeyer::CWNone);
m_cwSmoother.setNbFadeSamples(96); // 2 ms at 48 kHz m_cwSmoother.setNbFadeSamples(192); // 4 ms at 48 kHz
apply(); apply();
} }
@ -674,7 +674,7 @@ void SSBMod::apply()
{ {
m_settingsMutex.lock(); m_settingsMutex.lock();
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate); m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 500); // 2 ms m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
m_settingsMutex.unlock(); m_settingsMutex.unlock();
} }

2
sdrbase/dsp/cwkeyer.cpp
View File

@ -459,7 +459,7 @@ CWSmoother::CWSmoother() :
m_fadeInSamples(0), m_fadeInSamples(0),
m_fadeOutSamples(0) m_fadeOutSamples(0)
{ {
setNbFadeSamples(96); // default is 2ms at 48 kHz sample rate setNbFadeSamples(192); // default is 4 ms at 48 kHz sample rate
} }
CWSmoother::~CWSmoother() CWSmoother::~CWSmoother()