mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-12-25 18:38:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

More bugfix

Browse Source
This commit is contained in:
Ryzerth 2021-03-30 03:37:40 +02:00
parent ce56d03c3e
commit bcc1744a76
7 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/core.cpp
View File

@ -131,7 +131,8 @@ int sdrpp_main(int argc, char *argv[]) {
defConfig["moduleInstances"]["RTL-SDR Source"] = "rtl_sdr_source"; defConfig["moduleInstances"]["RTL-SDR Source"] = "rtl_sdr_source";
defConfig["moduleInstances"]["AirspyHF+ Source"] = "airspyhf_source"; defConfig["moduleInstances"]["AirspyHF+ Source"] = "airspyhf_source";
defConfig["moduleInstances"]["Airspy Source"] = "airspy_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["moduleInstances"]["Audio Sink"] = "audio_sink";
defConfig["modules"] = json::array(); defConfig["modules"] = json::array();

2
core/src/dsp/convertion.h
View File

@ -129,8 +129,8 @@ namespace dsp {
RealToComplex(stream<float>* in) { init(in); } RealToComplex(stream<float>* in) { init(in); }
~RealToComplex() { ~RealToComplex() {
delete[] nullBuffer;
generic_block<RealToComplex>::stop(); generic_block<RealToComplex>::stop();
delete[] nullBuffer;
} }
void init(stream<float>* in) { void init(stream<float>* in) {

2
core/src/dsp/demodulator.h
View File

@ -193,7 +193,7 @@ namespace dsp {
StereoFMDemod(stream<complex_t>* in, float sampleRate, float deviation) { init(in, sampleRate, deviation); } StereoFMDemod(stream<complex_t>* in, float sampleRate, float deviation) { init(in, sampleRate, deviation); }
~StereoFMDemod() { ~StereoFMDemod() {
stop(); generic_block<StereoFMDemod>::stop();
delete[] doubledPilot; delete[] doubledPilot;
delete[] a_minus_b; delete[] a_minus_b;
delete[] a_out; delete[] a_out;

2
core/src/dsp/sink.h
View File

@ -103,8 +103,6 @@ namespace dsp {
NullSink(stream<T>* in) { init(in); } NullSink(stream<T>* in) { init(in); }
~NullSink() { generic_block<NullSink<T>>::stop(); }
void init(stream<T>* in) { void init(stream<T>* in) {
_in = in; _in = in;
generic_block<NullSink<T>>::registerInput(_in); generic_block<NullSink<T>>::registerInput(_in);

1
core/src/gui/main_window.cpp
View File

@ -54,7 +54,6 @@
// int fftSizeId = 0; // int fftSizeId = 0;
int fftSize = 8192 * 8; int fftSize = 8192 * 8;
std::thread worker;
std::mutex fft_mtx; std::mutex fft_mtx;
fftwf_complex *fft_in, *fft_out; fftwf_complex *fft_in, *fft_out;
fftwf_plan p; fftwf_plan p;

4
make_windows_package.ps1
View File

@ -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/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 build/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/
cp "C:/Program Files (x86)/RtAudio/bin/rtaudio.dll" sdrpp_windows_x64/ cp "C:/Program Files (x86)/RtAudio/bin/rtaudio.dll" sdrpp_windows_x64/

12
rtl_sdr_source/src/main.cpp
View File

@ -346,6 +346,18 @@ private:
if (ImGui::Combo(CONCAT("##_rtlsdr_ds_", _this->name), &_this->directSamplingMode, directSamplingModesTxt)) { if (ImGui::Combo(CONCAT("##_rtlsdr_ds_", _this->name), &_this->directSamplingMode, directSamplingModesTxt)) {
if (_this->running) { if (_this->running) {
rtlsdr_set_direct_sampling(_this->openDev, _this->directSamplingMode); 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 != "") { if (_this->selectedDevName != "") {
config.aquire(); config.aquire();