From 406ca837c3eb34c23cedda9f9c074517a044a3c0 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 2 Sep 2018 19:49:53 +0200
Subject: [PATCH] SSBMod and WFMMod: fixed compiler warnings

---
 plugins/channeltx/modssb/ssbmod.cpp | 13 +++++++++----
 plugins/channeltx/modwfm/wfmmod.cpp |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp
index 501575ac7..17eb07625 100644
--- a/plugins/channeltx/modssb/ssbmod.cpp
+++ b/plugins/channeltx/modssb/ssbmod.cpp
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <complex.h>
+#include <algorithm>
 
 #include "SWGChannelSettings.h"
 #include "SWGChannelReport.h"
@@ -80,8 +81,10 @@ SSBMod::SSBMod(DeviceSinkAPI *deviceAPI) :
     m_DSBFilter = new fftfilt((2.0f * m_settings.m_bandwidth) / m_audioSampleRate, 2 * m_ssbFftLen);
     m_SSBFilterBuffer = new Complex[m_ssbFftLen>>1]; // filter returns data exactly half of its size
     m_DSBFilterBuffer = new Complex[m_ssbFftLen];
-    memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1));
-    memset(m_DSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen));
+    std::fill(m_SSBFilterBuffer, m_SSBFilterBuffer+(m_ssbFftLen>>1), Complex{0,0});
+    std::fill(m_DSBFilterBuffer, m_DSBFilterBuffer+m_ssbFftLen, Complex{0,0});
+//    memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1));
+//    memset(m_DSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen));
 
 	m_audioBuffer.resize(1<<14);
 	m_audioBufferFill = 0;
@@ -787,12 +790,14 @@ void SSBMod::applySettings(const SSBModSettings& settings, bool force)
     {
         if (settings.m_dsb)
         {
-            memset(m_DSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen));
+            std::fill(m_DSBFilterBuffer, m_DSBFilterBuffer+m_ssbFftLen, Complex{0,0});
+            //memset(m_DSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen));
             m_DSBFilterBufferIndex = 0;
         }
         else
         {
-            memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1));
+            std::fill(m_SSBFilterBuffer, m_SSBFilterBuffer+(m_ssbFftLen>>1), Complex{0,0});
+            //memset(m_SSBFilterBuffer, 0, sizeof(Complex)*(m_ssbFftLen>>1));
             m_SSBFilterBufferIndex = 0;
         }
     }
diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp
index 5f7660f5c..d8929546f 100644
--- a/plugins/channeltx/modwfm/wfmmod.cpp
+++ b/plugins/channeltx/modwfm/wfmmod.cpp
@@ -68,7 +68,8 @@ WFMMod::WFMMod(DeviceSinkAPI *deviceAPI) :
 
     m_rfFilter = new fftfilt(-62500.0 / 384000.0, 62500.0 / 384000.0, m_rfFilterFFTLength);
     m_rfFilterBuffer = new Complex[m_rfFilterFFTLength];
-    memset(m_rfFilterBuffer, 0, sizeof(Complex)*(m_rfFilterFFTLength));
+    std::fill(m_rfFilterBuffer, m_rfFilterBuffer+m_rfFilterFFTLength, Complex{0,0});
+    //memset(m_rfFilterBuffer, 0, sizeof(Complex)*(m_rfFilterFFTLength));
     m_rfFilterBufferIndex = 0;
 
 	m_audioBuffer.resize(1<<14);