mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-26 01:39:05 -05:00
NFM modulator: use settings in modulator
This commit is contained in:
f4exb
parent
d49ff21985
commit
028cf1e4eb
@ -51,16 +51,6 @@ NFMMod::NFMMod() :
|
||||
{
|
||||
setObjectName("NFMod");
|
||||
|
||||
m_config.m_outputSampleRate = 48000;
|
||||
m_config.m_inputFrequencyOffset = 0;
|
||||
m_config.m_rfBandwidth = 12500;
|
||||
m_config.m_afBandwidth = 3000;
|
||||
m_config.m_fmDeviation = 5000.0f;
|
||||
m_config.m_toneFrequency = 1000.0f;
|
||||
m_config.m_audioSampleRate = DSPEngine::instance()->getAudioSampleRate();
|
||||
|
||||
apply();
|
||||
|
||||
m_audioBuffer.resize(1<<14);
|
||||
m_audioBufferFill = 0;
|
||||
|
||||
@ -68,15 +58,17 @@ NFMMod::NFMMod() :
|
||||
m_volumeAGC.resize(4096, 0.003, 0);
|
||||
m_magsq = 0.0;
|
||||
|
||||
m_toneNco.setFreq(1000.0, m_config.m_audioSampleRate);
|
||||
m_ctcssNco.setFreq(88.5, m_config.m_audioSampleRate);
|
||||
m_toneNco.setFreq(1000.0, m_settings.m_audioSampleRate);
|
||||
m_ctcssNco.setFreq(88.5, m_settings.m_audioSampleRate);
|
||||
DSPEngine::instance()->addAudioSource(&m_audioFifo);
|
||||
|
||||
// CW keyer
|
||||
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
|
||||
m_cwKeyer.setSampleRate(m_settings.m_audioSampleRate);
|
||||
m_cwKeyer.setWPM(13);
|
||||
m_cwKeyer.setMode(CWKeyer::CWNone);
|
||||
m_cwSmoother.setNbFadeSamples(192); // 2 ms @ 48 kHz
|
||||
|
||||
applySettings(m_settings, true);
|
||||
}
|
||||
|
||||
NFMMod::~NFMMod()
|
||||
@ -84,32 +76,9 @@ NFMMod::~NFMMod()
|
||||
DSPEngine::instance()->removeAudioSource(&m_audioFifo);
|
||||
}
|
||||
|
||||
void NFMMod::configure(MessageQueue* messageQueue,
|
||||
Real rfBandwidth,
|
||||
Real afBandwidth,
|
||||
float fmDeviation,
|
||||
float toneFrequency,
|
||||
float volumeFactor,
|
||||
bool audioMute,
|
||||
bool playLoop,
|
||||
bool ctcssOn,
|
||||
int ctcssFrequencyIndex)
|
||||
{
|
||||
Message* cmd = MsgConfigureNFMMod::create(rfBandwidth,
|
||||
afBandwidth,
|
||||
fmDeviation,
|
||||
toneFrequency,
|
||||
volumeFactor,
|
||||
audioMute,
|
||||
playLoop,
|
||||
ctcssOn,
|
||||
ctcssFrequencyIndex);
|
||||
messageQueue->push(cmd);
|
||||
}
|
||||
|
||||
void NFMMod::pull(Sample& sample)
|
||||
{
|
||||
if (m_running.m_channelMute)
|
||||
if (m_settings.m_channelMute)
|
||||
{
|
||||
sample.m_real = 0.0f;
|
||||
sample.m_imag = 0.0f;
|
||||
@ -154,7 +123,7 @@ void NFMMod::pull(Sample& sample)
|
||||
|
||||
void NFMMod::pullAudio(int nbSamples)
|
||||
{
|
||||
unsigned int nbSamplesAudio = nbSamples * ((Real) m_config.m_audioSampleRate / (Real) m_config.m_basebandSampleRate);
|
||||
unsigned int nbSamplesAudio = nbSamples * ((Real) m_settings.m_audioSampleRate / (Real) m_settings.m_basebandSampleRate);
|
||||
|
||||
if (nbSamplesAudio > m_audioBuffer.size())
|
||||
{
|
||||
@ -173,14 +142,14 @@ void NFMMod::modulateSample()
|
||||
calculateLevel(t);
|
||||
m_audioBufferFill++;
|
||||
|
||||
if (m_running.m_ctcssOn)
|
||||
if (m_settings.m_ctcssOn)
|
||||
{
|
||||
m_modPhasor += (m_running.m_fmDeviation / (float) m_running.m_audioSampleRate) * (0.85f * m_bandpass.filter(t) + 0.15f * 378.0f * m_ctcssNco.next()) * (M_PI / 378.0f);
|
||||
m_modPhasor += (m_settings.m_fmDeviation / (float) m_settings.m_audioSampleRate) * (0.85f * m_bandpass.filter(t) + 0.15f * 378.0f * m_ctcssNco.next()) * (M_PI / 378.0f);
|
||||
}
|
||||
else
|
||||
{
|
||||
// 378 = 302 * 1.25; 302 = number of filter taps (established experimentally)
|
||||
m_modPhasor += (m_running.m_fmDeviation / (float) m_running.m_audioSampleRate) * m_bandpass.filter(t) * (M_PI / 378.0f);
|
||||
m_modPhasor += (m_settings.m_fmDeviation / (float) m_settings.m_audioSampleRate) * m_bandpass.filter(t) * (M_PI / 378.0f);
|
||||
}
|
||||
|
||||
m_modSample.real(cos(m_modPhasor) * 29204.0f); // -1 dB
|
||||
@ -201,7 +170,7 @@ void NFMMod::pullAF(Real& sample)
|
||||
{
|
||||
if (m_ifstream.eof())
|
||||
{
|
||||
if (m_running.m_playLoop)
|
||||
if (m_settings.m_playLoop)
|
||||
{
|
||||
m_ifstream.clear();
|
||||
m_ifstream.seekg(0, std::ios::beg);
|
||||
@ -215,7 +184,7 @@ void NFMMod::pullAF(Real& sample)
|
||||
else
|
||||
{
|
||||
m_ifstream.read(reinterpret_cast<char*>(&sample), sizeof(Real));
|
||||
sample *= m_running.m_volumeFactor;
|
||||
sample *= m_settings.m_volumeFactor;
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -224,7 +193,7 @@ void NFMMod::pullAF(Real& sample)
|
||||
}
|
||||
break;
|
||||
case NFMModInputAudio:
|
||||
sample = ((m_audioBuffer[m_audioBufferFill].l + m_audioBuffer[m_audioBufferFill].r) / 65536.0f) * m_running.m_volumeFactor;
|
||||
sample = ((m_audioBuffer[m_audioBufferFill].l + m_audioBuffer[m_audioBufferFill].r) / 65536.0f) * m_settings.m_volumeFactor;
|
||||
break;
|
||||
case NFMModInputCWTone:
|
||||
Real fadeFactor;
|
||||
@ -275,8 +244,8 @@ void NFMMod::calculateLevel(Real& sample)
|
||||
|
||||
void NFMMod::start()
|
||||
{
|
||||
qDebug() << "NFMMod::start: m_outputSampleRate: " << m_config.m_outputSampleRate
|
||||
<< " m_inputFrequencyOffset: " << m_config.m_inputFrequencyOffset;
|
||||
qDebug() << "NFMMod::start: m_outputSampleRate: " << m_settings.m_outputSampleRate
|
||||
<< " m_inputFrequencyOffset: " << m_settings.m_inputFrequencyOffset;
|
||||
|
||||
m_audioFifo.clear();
|
||||
}
|
||||
@ -291,48 +260,46 @@ bool NFMMod::handleMessage(const Message& cmd)
|
||||
{
|
||||
UpChannelizer::MsgChannelizerNotification& notif = (UpChannelizer::MsgChannelizerNotification&) cmd;
|
||||
|
||||
m_config.m_basebandSampleRate = notif.getBasebandSampleRate();
|
||||
m_config.m_outputSampleRate = notif.getSampleRate();
|
||||
m_config.m_inputFrequencyOffset = notif.getFrequencyOffset();
|
||||
NFMModSettings settings = m_settings;
|
||||
|
||||
apply();
|
||||
settings.m_basebandSampleRate = notif.getBasebandSampleRate();
|
||||
settings.m_outputSampleRate = notif.getSampleRate();
|
||||
settings.m_inputFrequencyOffset = notif.getFrequencyOffset();
|
||||
|
||||
qDebug() << "NFMMod::handleMessage: MsgChannelizerNotification:"
|
||||
<< " m_basebandSampleRate: " << m_config.m_basebandSampleRate
|
||||
<< " m_outputSampleRate: " << m_config.m_outputSampleRate
|
||||
<< " m_inputFrequencyOffset: " << m_config.m_inputFrequencyOffset;
|
||||
applySettings(settings);
|
||||
|
||||
qDebug() << "NFMMod::handleMessage: MsgChannelizerNotification:"
|
||||
<< " m_basebandSampleRate: " << settings.m_basebandSampleRate
|
||||
<< " m_outputSampleRate: " << settings.m_outputSampleRate
|
||||
<< " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset;
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgConfigureNFMMod::match(cmd))
|
||||
{
|
||||
MsgConfigureNFMMod& cfg = (MsgConfigureNFMMod&) cmd;
|
||||
else if (MsgConfigureNFMMod::match(cmd))
|
||||
{
|
||||
MsgConfigureNFMMod& cfg = (MsgConfigureNFMMod&) cmd;
|
||||
|
||||
m_config.m_rfBandwidth = cfg.getRFBandwidth();
|
||||
m_config.m_afBandwidth = cfg.getAFBandwidth();
|
||||
m_config.m_fmDeviation = cfg.getFMDeviation();
|
||||
m_config.m_toneFrequency = cfg.getToneFrequency();
|
||||
m_config.m_volumeFactor = cfg.getVolumeFactor();
|
||||
m_config.m_channelMute = cfg.getChannelMute();
|
||||
m_config.m_playLoop = cfg.getPlayLoop();
|
||||
m_config.m_ctcssOn = cfg.getCTCSSOn();
|
||||
m_config.m_ctcssFrequency = NFMModSettings::getCTCSSFreq(cfg.getCTCSSFrequencyIndex());
|
||||
NFMModSettings settings = cfg.getSettings();
|
||||
|
||||
apply();
|
||||
settings.m_outputSampleRate = m_settings.m_outputSampleRate;
|
||||
settings.m_inputFrequencyOffset = m_settings.m_inputFrequencyOffset;
|
||||
|
||||
qDebug() << "NFMMod::handleMessage: MsgConfigureNFMMod:"
|
||||
<< " m_rfBandwidth: " << m_config.m_rfBandwidth
|
||||
<< " m_afBandwidth: " << m_config.m_afBandwidth
|
||||
<< " m_fmDeviation: " << m_config.m_fmDeviation
|
||||
<< " m_toneFrequency: " << m_config.m_toneFrequency
|
||||
<< " m_volumeFactor: " << m_config.m_volumeFactor
|
||||
<< " m_channelMute: " << m_config.m_channelMute
|
||||
<< " m_playLoop: " << m_config.m_playLoop
|
||||
<< " m_ctcssOn: " << m_config.m_ctcssOn
|
||||
<< " m_ctcssFrequency: " << m_config.m_ctcssFrequency;
|
||||
qDebug() << "NFMMod::handleMessage: MsgConfigureNFMMod:"
|
||||
<< " m_rfBandwidth: " << settings.m_rfBandwidth
|
||||
<< " m_afBandwidth: " << settings.m_afBandwidth
|
||||
<< " m_fmDeviation: " << settings.m_fmDeviation
|
||||
<< " m_volumeFactor: " << settings.m_volumeFactor
|
||||
<< " m_toneFrequency: " << settings.m_toneFrequency
|
||||
<< " m_ctcssIndex: " << settings.m_ctcssIndex
|
||||
<< " m_ctcssOn: " << settings.m_ctcssOn
|
||||
<< " m_channelMute: " << settings.m_channelMute
|
||||
<< " m_playLoop: " << settings.m_playLoop
|
||||
<< " force: " << cfg.getForce();
|
||||
|
||||
return true;
|
||||
}
|
||||
applySettings(settings, cfg.getForce());
|
||||
|
||||
return true;
|
||||
}
|
||||
else if (MsgConfigureFileSourceName::match(cmd))
|
||||
{
|
||||
MsgConfigureFileSourceName& conf = (MsgConfigureFileSourceName&) cmd;
|
||||
@ -377,72 +344,6 @@ bool NFMMod::handleMessage(const Message& cmd)
|
||||
}
|
||||
}
|
||||
|
||||
void NFMMod::apply()
|
||||
{
|
||||
|
||||
if ((m_config.m_inputFrequencyOffset != m_running.m_inputFrequencyOffset) ||
|
||||
(m_config.m_outputSampleRate != m_running.m_outputSampleRate))
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_carrierNco.setFreq(m_config.m_inputFrequencyOffset, m_config.m_outputSampleRate);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if((m_config.m_outputSampleRate != m_running.m_outputSampleRate) ||
|
||||
(m_config.m_rfBandwidth != m_running.m_rfBandwidth))
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorConsumed = false;
|
||||
m_interpolatorDistance = (Real) m_config.m_audioSampleRate / (Real) m_config.m_outputSampleRate;
|
||||
m_interpolator.create(48, m_config.m_audioSampleRate, m_config.m_rfBandwidth / 2.2, 3.0);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if ((m_config.m_afBandwidth != m_running.m_afBandwidth) ||
|
||||
(m_config.m_audioSampleRate != m_running.m_audioSampleRate))
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_lowpass.create(301, m_config.m_audioSampleRate, 250.0);
|
||||
m_bandpass.create(301, m_config.m_audioSampleRate, 300.0, m_config.m_afBandwidth);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if ((m_config.m_toneFrequency != m_running.m_toneFrequency) ||
|
||||
(m_config.m_audioSampleRate != m_running.m_audioSampleRate))
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_toneNco.setFreq(m_config.m_toneFrequency, m_config.m_audioSampleRate);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if (m_config.m_audioSampleRate != m_running.m_audioSampleRate)
|
||||
{
|
||||
m_cwKeyer.setSampleRate(m_config.m_audioSampleRate);
|
||||
m_cwSmoother.setNbFadeSamples(m_config.m_audioSampleRate / 250); // 4 ms
|
||||
}
|
||||
|
||||
if ((m_config.m_ctcssFrequency != m_running.m_ctcssFrequency) ||
|
||||
(m_config.m_audioSampleRate != m_running.m_audioSampleRate))
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_ctcssNco.setFreq(m_config.m_ctcssFrequency, m_config.m_audioSampleRate);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
m_running.m_outputSampleRate = m_config.m_outputSampleRate;
|
||||
m_running.m_inputFrequencyOffset = m_config.m_inputFrequencyOffset;
|
||||
m_running.m_rfBandwidth = m_config.m_rfBandwidth;
|
||||
m_running.m_afBandwidth = m_config.m_afBandwidth;
|
||||
m_running.m_fmDeviation = m_config.m_fmDeviation;
|
||||
m_running.m_volumeFactor = m_config.m_volumeFactor;
|
||||
m_running.m_audioSampleRate = m_config.m_audioSampleRate;
|
||||
m_running.m_channelMute = m_config.m_channelMute;
|
||||
m_running.m_playLoop = m_config.m_playLoop;
|
||||
m_running.m_ctcssOn = m_config.m_ctcssOn;
|
||||
m_running.m_ctcssFrequency = m_config.m_ctcssFrequency;
|
||||
}
|
||||
|
||||
void NFMMod::openFileStream()
|
||||
{
|
||||
if (m_ifstream.is_open()) {
|
||||
@ -477,3 +378,59 @@ void NFMMod::seekFileStream(int seekPercentage)
|
||||
m_ifstream.seekg(seekPoint, std::ios::beg);
|
||||
}
|
||||
}
|
||||
|
||||
void NFMMod::applySettings(const NFMModSettings& settings, bool force)
|
||||
{
|
||||
if ((settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset) ||
|
||||
(settings.m_outputSampleRate != m_settings.m_outputSampleRate) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_carrierNco.setFreq(settings.m_inputFrequencyOffset, settings.m_outputSampleRate);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if((settings.m_outputSampleRate != m_settings.m_outputSampleRate) ||
|
||||
(settings.m_rfBandwidth != m_settings.m_rfBandwidth) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_interpolatorDistanceRemain = 0;
|
||||
m_interpolatorConsumed = false;
|
||||
m_interpolatorDistance = (Real) settings.m_audioSampleRate / (Real) settings.m_outputSampleRate;
|
||||
m_interpolator.create(48, settings.m_audioSampleRate, settings.m_rfBandwidth / 2.2, 3.0);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
if ((settings.m_afBandwidth != m_settings.m_afBandwidth) ||
|
||||
(settings.m_audioSampleRate != m_settings.m_audioSampleRate) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_lowpass.create(301, settings.m_audioSampleRate, 250.0);
|
||||
m_bandpass.create(301, settings.m_audioSampleRate, 300.0, settings.m_afBandwidth);
|
||||
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_audioSampleRate != m_settings.m_audioSampleRate) || force)
|
||||
{
|
||||
m_cwKeyer.setSampleRate(settings.m_audioSampleRate);
|
||||
m_cwSmoother.setNbFadeSamples(settings.m_audioSampleRate / 250); // 4 ms
|
||||
}
|
||||
|
||||
if ((settings.m_ctcssIndex != m_settings.m_ctcssIndex) ||
|
||||
(settings.m_audioSampleRate != m_settings.m_audioSampleRate) || force)
|
||||
{
|
||||
m_settingsMutex.lock();
|
||||
m_ctcssNco.setFreq(NFMModSettings::getCTCSSFreq(settings.m_ctcssIndex), settings.m_audioSampleRate);
|
||||
m_settingsMutex.unlock();
|
||||
}
|
||||
|
||||
m_settings = settings;
|
||||
}
|
||||
|
||||
|
||||
@ -40,6 +40,29 @@ class NFMMod : public BasebandSampleSource {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
class MsgConfigureNFMMod : public Message {
|
||||
MESSAGE_CLASS_DECLARATION
|
||||
|
||||
public:
|
||||
const NFMModSettings& getSettings() const { return m_settings; }
|
||||
bool getForce() const { return m_force; }
|
||||
|
||||
static MsgConfigureNFMMod* create(const NFMModSettings& settings, bool force)
|
||||
{
|
||||
return new MsgConfigureNFMMod(settings, force);
|
||||
}
|
||||
|
||||
private:
|
||||
NFMModSettings m_settings;
|
||||
bool m_force;
|
||||
|
||||
MsgConfigureNFMMod(const NFMModSettings& settings, bool force) :
|
||||
Message(),
|
||||
m_settings(settings),
|
||||
m_force(force)
|
||||
{ }
|
||||
};
|
||||
|
||||
typedef enum
|
||||
{
|
||||
NFMModInputNone,
|
||||
@ -180,17 +203,6 @@ public:
|
||||
NFMMod();
|
||||
~NFMMod();
|
||||
|
||||
void configure(MessageQueue* messageQueue,
|
||||
Real rfBandwidth,
|
||||
Real afBandwidth,
|
||||
float fmDeviation,
|
||||
float toneFrequency,
|
||||
float volumeFactor,
|
||||
bool channelMute,
|
||||
bool playLoop,
|
||||
bool ctcssOn,
|
||||
int ctcssFrequencyIndex);
|
||||
|
||||
virtual void pull(Sample& sample);
|
||||
virtual void pullAudio(int nbSamples);
|
||||
virtual void start();
|
||||
@ -212,118 +224,12 @@ signals:
|
||||
|
||||
|
||||
private:
|
||||
class MsgConfigureNFMMod : public Message
|
||||
{
|
||||
MESSAGE_CLASS_DECLARATION
|
||||
|
||||
public:
|
||||
Real getRFBandwidth() const { return m_rfBandwidth; }
|
||||
Real getAFBandwidth() const { return m_afBandwidth; }
|
||||
float getFMDeviation() const { return m_fmDeviation; }
|
||||
float getToneFrequency() const { return m_toneFrequency; }
|
||||
float getVolumeFactor() const { return m_volumeFactor; }
|
||||
bool getChannelMute() const { return m_channelMute; }
|
||||
bool getPlayLoop() const { return m_playLoop; }
|
||||
bool getCTCSSOn() const { return m_ctcssOn; }
|
||||
float getCTCSSFrequencyIndex() const { return m_ctcssFrequencyIndex; }
|
||||
|
||||
static MsgConfigureNFMMod* create(Real rfBandwidth,
|
||||
Real afBandwidth,
|
||||
float fmDeviation,
|
||||
float toneFrequency,
|
||||
float volumeFactor,
|
||||
bool channelMute,
|
||||
bool playLoop,
|
||||
bool ctcssOn,
|
||||
int ctcssFrequencyIndex)
|
||||
{
|
||||
return new MsgConfigureNFMMod(rfBandwidth,
|
||||
afBandwidth,
|
||||
fmDeviation,
|
||||
toneFrequency,
|
||||
volumeFactor,
|
||||
channelMute,
|
||||
playLoop,
|
||||
ctcssOn,
|
||||
ctcssFrequencyIndex);
|
||||
}
|
||||
|
||||
private:
|
||||
Real m_rfBandwidth;
|
||||
Real m_afBandwidth;
|
||||
float m_fmDeviation;
|
||||
float m_toneFrequency;
|
||||
float m_volumeFactor;
|
||||
bool m_channelMute;
|
||||
bool m_playLoop;
|
||||
bool m_ctcssOn;
|
||||
int m_ctcssFrequencyIndex;
|
||||
|
||||
MsgConfigureNFMMod(Real rfBandwidth,
|
||||
Real afBandwidth,
|
||||
float fmDeviation,
|
||||
float toneFrequency,
|
||||
float volumeFactor,
|
||||
bool channelMute,
|
||||
bool playLoop,
|
||||
bool ctcssOn,
|
||||
int ctcssFrequencyIndex) :
|
||||
Message(),
|
||||
m_rfBandwidth(rfBandwidth),
|
||||
m_afBandwidth(afBandwidth),
|
||||
m_fmDeviation(fmDeviation),
|
||||
m_toneFrequency(toneFrequency),
|
||||
m_volumeFactor(volumeFactor),
|
||||
m_channelMute(channelMute),
|
||||
m_playLoop(playLoop),
|
||||
m_ctcssOn(ctcssOn),
|
||||
m_ctcssFrequencyIndex(ctcssFrequencyIndex)
|
||||
{ }
|
||||
};
|
||||
|
||||
//=================================================================
|
||||
|
||||
enum RateState {
|
||||
RSInitialFill,
|
||||
RSRunning
|
||||
};
|
||||
|
||||
struct Config {
|
||||
int m_basebandSampleRate;
|
||||
int m_outputSampleRate;
|
||||
qint64 m_inputFrequencyOffset;
|
||||
Real m_rfBandwidth;
|
||||
Real m_afBandwidth;
|
||||
float m_fmDeviation;
|
||||
float m_toneFrequency;
|
||||
float m_volumeFactor;
|
||||
quint32 m_audioSampleRate;
|
||||
bool m_channelMute;
|
||||
bool m_playLoop;
|
||||
bool m_ctcssOn;
|
||||
float m_ctcssFrequency;
|
||||
|
||||
Config() :
|
||||
m_basebandSampleRate(0),
|
||||
m_outputSampleRate(-1),
|
||||
m_inputFrequencyOffset(0),
|
||||
m_rfBandwidth(-1),
|
||||
m_afBandwidth(-1),
|
||||
m_fmDeviation(5000.0f),
|
||||
m_toneFrequency(1000.0f),
|
||||
m_volumeFactor(1.0f),
|
||||
m_audioSampleRate(0),
|
||||
m_channelMute(false),
|
||||
m_playLoop(false),
|
||||
m_ctcssOn(false),
|
||||
m_ctcssFrequency(88.5)
|
||||
{ }
|
||||
};
|
||||
|
||||
//=================================================================
|
||||
|
||||
Config m_config;
|
||||
Config m_running;
|
||||
NFMModSettings m_settings;
|
||||
|
||||
NCO m_carrierNco;
|
||||
NCOF m_toneNco;
|
||||
@ -362,7 +268,8 @@ private:
|
||||
CWSmoother m_cwSmoother;
|
||||
static const int m_levelNbSamples;
|
||||
|
||||
void apply();
|
||||
//void apply();
|
||||
void applySettings(const NFMModSettings& settings, bool force = false);
|
||||
void pullAF(Real& sample);
|
||||
void calculateLevel(Real& sample);
|
||||
void modulateSample();
|
||||
|
||||
@ -307,13 +307,14 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
|
||||
setAttribute(Qt::WA_DeleteOnClose, true);
|
||||
|
||||
blockApplySettings(true);
|
||||
|
||||
ui->rfBW->clear();
|
||||
for (int i = 0; i < NFMModSettings::m_nbRfBW; i++) {
|
||||
ui->rfBW->addItem(QString("%1").arg(NFMModSettings::getRFBW(i) / 1000.0, 0, 'f', 2));
|
||||
}
|
||||
ui->rfBW->setCurrentIndex(6);
|
||||
blockApplySettings(false);
|
||||
|
||||
blockApplySettings(false);
|
||||
|
||||
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
|
||||
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
|
||||
@ -377,7 +378,7 @@ void NFMModGUI::blockApplySettings(bool block)
|
||||
m_doApplySettings = !block;
|
||||
}
|
||||
|
||||
void NFMModGUI::applySettings(bool force __attribute__((unused)))
|
||||
void NFMModGUI::applySettings(bool force)
|
||||
{
|
||||
if (m_doApplySettings)
|
||||
{
|
||||
@ -389,16 +390,8 @@ void NFMModGUI::applySettings(bool force __attribute__((unused)))
|
||||
|
||||
ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
|
||||
|
||||
m_nfmMod->configure(m_nfmMod->getInputMessageQueue(),
|
||||
m_settings.m_rfBandwidth,
|
||||
m_settings.m_afBandwidth,
|
||||
m_settings.m_fmDeviation, // value is in '100 Hz
|
||||
m_settings.m_toneFrequency,
|
||||
m_settings.m_volumeFactor,
|
||||
m_settings.m_channelMute,
|
||||
m_settings.m_playLoop,
|
||||
m_settings.m_ctcssOn,
|
||||
m_settings.m_ctcssIndex);
|
||||
NFMMod::MsgConfigureNFMMod *msg = NFMMod::MsgConfigureNFMMod::create(m_settings, force);
|
||||
m_nfmMod->getInputMessageQueue()->push(msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user