mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-01-28 18:44:43 +01:00
fix merge issue
This commit is contained in:
parent
84da183559
commit
75800e0ca2
@ -16,8 +16,8 @@ namespace demod {
|
||||
public:
|
||||
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) {
|
||||
init(name, config, input, bandwidth, audioSR);
|
||||
WFM(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth) : diag(0.5, 4096) {
|
||||
init(name, config, input, bandwidth);
|
||||
}
|
||||
|
||||
~WFM() {
|
||||
|
@ -43,6 +43,7 @@ public:
|
||||
audio.setErrorCallback(&errorCallback);
|
||||
#endif
|
||||
|
||||
// Load config (TODO)
|
||||
bool created = false;
|
||||
std::string device = "";
|
||||
// config.acquire();
|
||||
@ -59,6 +60,7 @@ public:
|
||||
// }
|
||||
// config.release(modified);
|
||||
|
||||
// List devices
|
||||
RtAudio::DeviceInfo info;
|
||||
#if RTAUDIO_VERSION_MAJOR >= 6
|
||||
for (int i : audio.getDeviceIds()) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user