@ -73,9 +73,10 @@ WFMMod::WFMMod(DeviceSinkAPI *deviceAPI) :
@@ -73,9 +73,10 @@ WFMMod::WFMMod(DeviceSinkAPI *deviceAPI) :
m_magsq = 0.0 ;
m_toneNco . setFreq ( 1000.0 , m_settings . m_audioSampleRate ) ;
m_toneNcoRF . setFreq ( 1000.0 , m_outputSampleRate ) ;
DSPEngine : : instance ( ) - > getAudioDeviceManager ( ) - > addAudioSource ( & m_audioFifo , getInputMessageQueue ( ) ) ;
m_audioSampleRate = DSPEngine : : instance ( ) - > getAudioDeviceManager ( ) - > getInputSampleRate ( ) ;
m_toneNcoRF . setFreq ( 1000.0 , m_outputSampleRate ) ;
// CW keyer
m_cwKeyer . setSampleRate ( m_outputSampleRate ) ;
@ -164,7 +165,7 @@ void WFMMod::pull(Sample& sample)
@@ -164,7 +165,7 @@ void WFMMod::pull(Sample& sample)
void WFMMod : : pullAudio ( int nbSamples )
{
unsigned int nbSamplesAudio = nbSamples * ( ( Real ) m_settings . m_ audioSampleRate / ( Real ) m_basebandSampleRate ) ;
unsigned int nbSamplesAudio = nbSamples * ( ( Real ) m_audioSampleRate / ( Real ) m_basebandSampleRate ) ;
if ( nbSamplesAudio > m_audioBuffer . size ( ) )
{
@ -359,6 +360,20 @@ bool WFMMod::handleMessage(const Message& cmd)
@@ -359,6 +360,20 @@ bool WFMMod::handleMessage(const Message& cmd)
return true ;
}
else if ( DSPConfigureAudio : : match ( cmd ) )
{
DSPConfigureAudio & cfg = ( DSPConfigureAudio & ) cmd ;
uint32_t sampleRate = cfg . getSampleRate ( ) ;
qDebug ( ) < < " WFMMod::handleMessage: DSPConfigureAudio: "
< < " sampleRate: " < < sampleRate ;
if ( sampleRate ! = m_audioSampleRate ) {
applyAudioSampleRate ( sampleRate ) ;
}
return true ;
}
else if ( DSPSignalNotification : : match ( cmd ) )
{
return true ;
@ -404,6 +419,20 @@ void WFMMod::seekFileStream(int seekPercentage)
@@ -404,6 +419,20 @@ void WFMMod::seekFileStream(int seekPercentage)
}
}
void WFMMod : : applyAudioSampleRate ( int sampleRate )
{
qDebug ( " WFMMod::applyAudioSampleRate: %d " , sampleRate ) ;
m_settingsMutex . lock ( ) ;
m_interpolatorDistanceRemain = 0 ;
m_interpolatorConsumed = false ;
m_interpolatorDistance = ( Real ) sampleRate / ( Real ) m_outputSampleRate ;
m_interpolator . create ( 48 , sampleRate , m_settings . m_rfBandwidth / 2.2 , 3.0 ) ;
m_settingsMutex . unlock ( ) ;
m_audioSampleRate = sampleRate ;
}
void WFMMod : : applyChannelSettings ( int basebandSampleRate , int outputSampleRate , int inputFrequencyOffset , bool force )
{
qDebug ( ) < < " WFMMod::applyChannelSettings: "
@ -424,8 +453,8 @@ void WFMMod::applyChannelSettings(int basebandSampleRate, int outputSampleRate,
@@ -424,8 +453,8 @@ void WFMMod::applyChannelSettings(int basebandSampleRate, int outputSampleRate,
m_settingsMutex . lock ( ) ;
m_interpolatorDistanceRemain = 0 ;
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 ) ;
m_interpolatorDistance = ( Real ) m_audioSampleRate / ( Real ) outputSampleRate ;
m_interpolator . create ( 48 , m_audioSampleRate , m_settings . m_rfBandwidth / 2.2 , 3.0 ) ;
Real lowCut = - ( m_settings . m_rfBandwidth / 2.0 ) / outputSampleRate ;
Real hiCut = ( m_settings . m_rfBandwidth / 2.0 ) / outputSampleRate ;
m_rfFilter - > create_filter ( lowCut , hiCut ) ;
@ -451,16 +480,16 @@ void WFMMod::applySettings(const WFMModSettings& settings, bool force)
@@ -451,16 +480,16 @@ void WFMMod::applySettings(const WFMModSettings& settings, bool force)
< < " m_toneFrequency: " < < settings . m_toneFrequency
< < " m_channelMute: " < < settings . m_channelMute
< < " m_playLoop: " < < settings . m_playLoop
< < " m_audioDeviceName: " < < settings . m_audioDeviceName
< < " force: " < < force ;
if ( ( settings . m_audioSampleRate ! = m_settings . m_audioSampleRate ) | |
( settings . m_afBandwidth ! = m_settings . m_afBandwidth ) | | force )
if ( ( settings . m_afBandwidth ! = m_settings . m_afBandwidth ) | | force )
{
m_settingsMutex . lock ( ) ;
m_interpolatorDistanceRemain = 0 ;
m_interpolatorConsumed = false ;
m_interpolatorDistance = ( Real ) settings . m_audioSampleRate / ( Real ) m_outputSampleRate ;
m_interpolator . create ( 48 , settings . m_audioSampleRate , settings . m_rfBandwidth / 2.2 , 3.0 ) ;
m_interpolatorDistance = ( Real ) m_audioSampleRate / ( Real ) m_outputSampleRate ;
m_interpolator . create ( 48 , m_audioSampleRate , settings . m_rfBandwidth / 2.2 , 3.0 ) ;
m_settingsMutex . unlock ( ) ;
}
@ -480,6 +509,18 @@ void WFMMod::applySettings(const WFMModSettings& settings, bool force)
@@ -480,6 +509,18 @@ void WFMMod::applySettings(const WFMModSettings& settings, bool force)
m_settingsMutex . unlock ( ) ;
}
if ( ( settings . m_audioDeviceName ! = m_settings . m_audioDeviceName ) | | force )
{
AudioDeviceManager * audioDeviceManager = DSPEngine : : instance ( ) - > getAudioDeviceManager ( ) ;
int audioDeviceIndex = audioDeviceManager - > getInputDeviceIndex ( settings . m_audioDeviceName ) ;
audioDeviceManager - > addAudioSource ( & m_audioFifo , getInputMessageQueue ( ) , audioDeviceIndex ) ;
uint32_t audioSampleRate = audioDeviceManager - > getInputSampleRate ( audioDeviceIndex ) ;
if ( m_audioSampleRate ! = audioSampleRate ) {
applyAudioSampleRate ( audioSampleRate ) ;
}
}
m_settings = settings ;
}