resolve conflict in radio

AlexandreRouma · AlexandreRouma · commit 0144d8e8ce59 · 2024-01-30T18:08:17.000+01:00
diff --git a/decoder_modules/radio/src/demodulators/wfm.h b/decoder_modules/radio/src/demodulators/wfm.h
@@ -16,8 +16,8 @@ namespace demod {
     public:
         WFM() {}
 
-        WFM(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth) {
-            init(name, config, input, bandwidth);
+        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() {

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ namespace demod {`
`16`	`16`	`public:`
`17`	`17`	`WFM() {}`
`18`	`18`
`19`		`- WFM(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth) {`
`20`		`- init(name, config, input, bandwidth);`
	`19`	`+ WFM(std::string name, ConfigManager* config, dsp::stream<dsp::complex_t>* input, double bandwidth, double audioSR) : diag(0.5, 4096) {`
	`20`	`+ init(name, config, input, bandwidth, audioSR);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`~WFM() {`