mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-06-25 12:07:49 +02:00
Fixed some stuff
This commit is contained in:
@ -170,7 +170,7 @@ private:
|
||||
|
||||
const float bwMax = 500;
|
||||
const float bwMin = 100;
|
||||
const float bbSampRate = 6000;
|
||||
const float bbSampRate = 500;
|
||||
|
||||
std::string uiPrefix;
|
||||
float snapInterval = 10;
|
||||
|
@ -48,15 +48,12 @@ public:
|
||||
resamp.init(&demod.out, &win, bbSampRate, audioSampRate);
|
||||
win.setSampleRate(bbSampRate * resamp.getInterpolation());
|
||||
resamp.updateWindow(&win);
|
||||
|
||||
m2s.init(&resamp.out);
|
||||
}
|
||||
|
||||
void start() {
|
||||
squelch.start();
|
||||
demod.start();
|
||||
resamp.start();
|
||||
m2s.start();
|
||||
running = true;
|
||||
}
|
||||
|
||||
@ -64,7 +61,6 @@ public:
|
||||
squelch.stop();
|
||||
demod.stop();
|
||||
resamp.stop();
|
||||
m2s.stop();
|
||||
running = false;
|
||||
}
|
||||
|
||||
@ -108,7 +104,7 @@ public:
|
||||
}
|
||||
|
||||
dsp::stream<dsp::stereo_t>* getOutput() {
|
||||
return &m2s.out;
|
||||
return &resamp.out;
|
||||
}
|
||||
|
||||
void showMenu() {
|
||||
@ -172,8 +168,7 @@ private:
|
||||
dsp::Squelch squelch;
|
||||
dsp::FMDemod demod;
|
||||
dsp::filter_window::BlackmanWindow win;
|
||||
dsp::PolyphaseResampler<float> resamp;
|
||||
dsp::MonoToStereo m2s;
|
||||
dsp::PolyphaseResampler<dsp::stereo_t> resamp;
|
||||
|
||||
ConfigManager* _config;
|
||||
|
||||
|
@ -57,7 +57,6 @@ public:
|
||||
|
||||
deemp.init(&resamp.out, audioSampRate, tau);
|
||||
|
||||
m2s.init(&deemp.out);
|
||||
}
|
||||
|
||||
void start() {
|
||||
@ -65,7 +64,6 @@ public:
|
||||
demod.start();
|
||||
resamp.start();
|
||||
deemp.start();
|
||||
m2s.start();
|
||||
running = true;
|
||||
}
|
||||
|
||||
@ -74,7 +72,6 @@ public:
|
||||
demod.stop();
|
||||
resamp.stop();
|
||||
deemp.stop();
|
||||
m2s.stop();
|
||||
running = false;
|
||||
}
|
||||
|
||||
@ -121,7 +118,7 @@ public:
|
||||
}
|
||||
|
||||
dsp::stream<dsp::stereo_t>* getOutput() {
|
||||
return &m2s.out;
|
||||
return &deemp.out;
|
||||
}
|
||||
|
||||
void showMenu() {
|
||||
@ -209,9 +206,8 @@ private:
|
||||
dsp::Squelch squelch;
|
||||
dsp::FMDemod demod;
|
||||
dsp::filter_window::BlackmanWindow win;
|
||||
dsp::PolyphaseResampler<float> resamp;
|
||||
dsp::PolyphaseResampler<dsp::stereo_t> resamp;
|
||||
dsp::BFMDeemp deemp;
|
||||
dsp::MonoToStereo m2s;
|
||||
|
||||
ConfigManager* _config;
|
||||
|
||||
|
Reference in New Issue
Block a user