mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-30 03:14:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
AlexandreRouma 2024-01-30 18:09:59 +01:00
parent 84da183559
commit 75800e0ca2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
decoder_modules/radio/src/demodulators/wfm.h
View File

@ -16,8 +16,8 @@ namespace demod {
public: public:
WFM() : diag(0.5, 4096) {} WFM() : diag(0.5, 4096) {}
WFM(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth, double audioSR) : diag(0.5, 4096) { WFM(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth) : diag(0.5, 4096) {
init(name, config, input, bandwidth, audioSR); init(name, config, input, bandwidth);
} }
~WFM() { ~WFM() {

2
sink_modules/audio_sink/src/main.cpp
View File

@ -43,6 +43,7 @@ public:
audio.setErrorCallback(&errorCallback); audio.setErrorCallback(&errorCallback);
#endif #endif
// Load config (TODO)
bool created = false; bool created = false;
std::string device = ""; std::string device = "";
// config.acquire(); // config.acquire();
@ -59,6 +60,7 @@ public:
// } // }
// config.release(modified); // config.release(modified);
// List devices
RtAudio::DeviceInfo info; RtAudio::DeviceInfo info;
#if RTAUDIO_VERSION_MAJOR >= 6 #if RTAUDIO_VERSION_MAJOR >= 6
for (int i : audio.getDeviceIds()) { for (int i : audio.getDeviceIds()) {