Better initial sample rate setup, remove hard-coded default rate and use device info matching /w fallback

This commit is contained in:
Charles J. Cliffe
2015-03-22 20:47:07 -04:00
parent 4147582d2a
commit d5d44b0b30
8 changed files with 86 additions and 12 deletions
+2 -2
View File
@@ -132,8 +132,8 @@ public:
int demodType;
DemodulatorThreadParameters() :
frequency(0), sampleRate(DEFAULT_SAMPLE_RATE), bandwidth(200000), audioSampleRate(
DEFAULT_AUDIO_SAMPLE_RATE), demodType(DEMOD_TYPE_FM) {
frequency(0), sampleRate(DEFAULT_SAMPLE_RATE), bandwidth(200000), audioSampleRate(0),
demodType(DEMOD_TYPE_FM) {
}
+1 -1
View File
@@ -222,7 +222,7 @@ void DemodulatorThread::threadMain() {
demodStereoData.resize(bufSize);
}
double freq = (2.0 * M_PI) * (((double) abs(38000)) / ((double) inp->sampleRate));
double freq = (2.0 * M_PI) * ((double) 38000) / ((double) inp->sampleRate);
if (stereoShiftFrequency != freq) {
nco_crcf_set_frequency(stereoShifter, freq);