fix merge issue

Author: AlexandreRouma

decoder_modules/radio/src/demodulators/wfm.h

@@ -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() {

sink_modules/audio_sink/src/main.cpp

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