mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2024-12-25 02:18:30 +01:00
More bugfix
This commit is contained in:
parent
ce56d03c3e
commit
bcc1744a76
@ -131,7 +131,8 @@ int sdrpp_main(int argc, char *argv[]) {
|
||||
defConfig["moduleInstances"]["RTL-SDR Source"] = "rtl_sdr_source";
|
||||
defConfig["moduleInstances"]["AirspyHF+ Source"] = "airspyhf_source";
|
||||
defConfig["moduleInstances"]["Airspy Source"] = "airspy_source";
|
||||
//defConfig["moduleInstances"]["SDRplay Source"] = "sdrplay_source";
|
||||
defConfig["moduleInstances"]["File Source"] = "file_source";
|
||||
defConfig["moduleInstances"]["SDRplay Source"] = "sdrplay_source";
|
||||
defConfig["moduleInstances"]["Audio Sink"] = "audio_sink";
|
||||
|
||||
defConfig["modules"] = json::array();
|
||||
|
@ -129,8 +129,8 @@ namespace dsp {
|
||||
RealToComplex(stream<float>* in) { init(in); }
|
||||
|
||||
~RealToComplex() {
|
||||
delete[] nullBuffer;
|
||||
generic_block<RealToComplex>::stop();
|
||||
delete[] nullBuffer;
|
||||
}
|
||||
|
||||
void init(stream<float>* in) {
|
||||
|
@ -193,7 +193,7 @@ namespace dsp {
|
||||
StereoFMDemod(stream<complex_t>* in, float sampleRate, float deviation) { init(in, sampleRate, deviation); }
|
||||
|
||||
~StereoFMDemod() {
|
||||
stop();
|
||||
generic_block<StereoFMDemod>::stop();
|
||||
delete[] doubledPilot;
|
||||
delete[] a_minus_b;
|
||||
delete[] a_out;
|
||||
|
@ -103,8 +103,6 @@ namespace dsp {
|
||||
|
||||
NullSink(stream<T>* in) { init(in); }
|
||||
|
||||
~NullSink() { generic_block<NullSink<T>>::stop(); }
|
||||
|
||||
void init(stream<T>* in) {
|
||||
_in = in;
|
||||
generic_block<NullSink<T>>::registerInput(_in);
|
||||
|
@ -54,7 +54,6 @@
|
||||
// int fftSizeId = 0;
|
||||
int fftSize = 8192 * 8;
|
||||
|
||||
std::thread worker;
|
||||
std::mutex fft_mtx;
|
||||
fftwf_complex *fft_in, *fft_out;
|
||||
fftwf_plan p;
|
||||
|
@ -29,6 +29,10 @@ cp build/rtl_tcp_source/Release/rtl_tcp_source.dll sdrpp_windows_x64/modules/
|
||||
|
||||
cp build/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/
|
||||
|
||||
cp build/file_source/Release/file_source.dll sdrpp_windows_x64/modules/
|
||||
|
||||
cp build/sdrplay_source/Release/sdrplay_source.dll sdrpp_windows_x64/modules/
|
||||
|
||||
cp build/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/
|
||||
cp "C:/Program Files (x86)/RtAudio/bin/rtaudio.dll" sdrpp_windows_x64/
|
||||
|
||||
|
@ -346,6 +346,18 @@ private:
|
||||
if (ImGui::Combo(CONCAT("##_rtlsdr_ds_", _this->name), &_this->directSamplingMode, directSamplingModesTxt)) {
|
||||
if (_this->running) {
|
||||
rtlsdr_set_direct_sampling(_this->openDev, _this->directSamplingMode);
|
||||
|
||||
// Update gains (fix for librtlsdr bug)
|
||||
if (_this->directSamplingMode == false) {
|
||||
rtlsdr_set_agc_mode(_this->openDev, _this->rtlAgc);
|
||||
if (_this->tunerAgc) {
|
||||
rtlsdr_set_tuner_gain_mode(_this->openDev, 0);
|
||||
}
|
||||
else {
|
||||
rtlsdr_set_tuner_gain_mode(_this->openDev, 1);
|
||||
rtlsdr_set_tuner_gain(_this->openDev, _this->gainList[_this->gainId]);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (_this->selectedDevName != "") {
|
||||
config.aquire();
|
||||
|
Loading…
Reference in New Issue
Block a user