From 24d8da247c8a2a00b92b5f633839991336c7f8cf Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Thu, 18 Mar 2021 20:33:52 +0000
Subject: [PATCH] Fix gcc warnings

---
 plugins/channeltx/moddatv/datvmodgui.cpp    |  2 ++
 plugins/channeltx/moddatv/datvmodsource.cpp | 31 +++++++++++++++++++--
 sdrbase/dsp/raisedcosine.h                  |  2 +-
 sdrbase/dsp/rootraisedcosine.h              |  4 +--
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/plugins/channeltx/moddatv/datvmodgui.cpp b/plugins/channeltx/moddatv/datvmodgui.cpp
index 690aa9f4f..23dd8fa2f 100644
--- a/plugins/channeltx/moddatv/datvmodgui.cpp
+++ b/plugins/channeltx/moddatv/datvmodgui.cpp
@@ -287,12 +287,14 @@ void DATVModGUI::on_modulation_currentIndexChanged(int index)
 
 void DATVModGUI::on_rollOff_currentIndexChanged(int index)
 {
+    (void) index;
     m_settings.m_rollOff = ui->rollOff->currentText().toFloat();
     applySettings();
 }
 
 void DATVModGUI::on_fec_currentIndexChanged(int index)
 {
+    (void) index;
     m_settings.m_fec = DATVModSettings::mapCodeRate(ui->fec->currentText());
     applySettings();
 }
diff --git a/plugins/channeltx/moddatv/datvmodsource.cpp b/plugins/channeltx/moddatv/datvmodsource.cpp
index c36c11547..187244482 100644
--- a/plugins/channeltx/moddatv/datvmodsource.cpp
+++ b/plugins/channeltx/moddatv/datvmodsource.cpp
@@ -95,6 +95,27 @@ int DATVModSource::getDVBSDataBitrate(const DATVModSettings& settings)
     case DATVModSettings::FEC78:
         convFactor = 7.0f/8.0f;
         break;
+    case DATVModSettings::FEC45:
+        convFactor = 4.0f/5.0f;
+        break;
+    case DATVModSettings::FEC89:
+        convFactor = 8.0f/9.0f;
+        break;
+    case DATVModSettings::FEC910:
+        convFactor = 9.0f/10.0f;
+        break;
+    case DATVModSettings::FEC14:
+        convFactor = 1.0f/4.0f;
+        break;
+    case DATVModSettings::FEC13:
+        convFactor = 1.0f/3.0f;
+        break;
+    case DATVModSettings::FEC25:
+        convFactor = 2.0f/5.0f;
+        break;
+    case DATVModSettings::FEC35:
+        convFactor = 3.0f/5.0f;
+        break;
     }
     switch (settings.m_modulation)
     {
@@ -107,6 +128,12 @@ int DATVModSource::getDVBSDataBitrate(const DATVModSettings& settings)
     case DATVModSettings::PSK8:
         bitsPerSymbol = 3.0f;
         break;
+    case DATVModSettings::APSK16:
+        bitsPerSymbol = 4.0f;
+        break;
+    case DATVModSettings::APSK32:
+        bitsPerSymbol = 5.0f;
+        break;
     }
 
     return std::round(settings.m_symbolRate * bitsPerSymbol * rsFactor * convFactor);
@@ -255,10 +282,10 @@ void DATVModSource::modulateSample()
                 int size = ba.size();
                 char *data = ba.data();
 
-                if (size <= sizeof(m_udpBuffer))
+                if (size <= (int)sizeof(m_udpBuffer))
                 {
                     memcpy(m_mpegTS, data, sizeof(m_mpegTS));
-                    if (size >= sizeof(m_mpegTS))
+                    if (size >= (int)sizeof(m_mpegTS))
                         memcpy(&m_udpBuffer[0], &data[sizeof(m_mpegTS)], size - sizeof(m_mpegTS));
                     m_udpBufferIdx = 0;
                     m_udpBufferCount = (size / sizeof(m_mpegTS)) - 1;
diff --git a/sdrbase/dsp/raisedcosine.h b/sdrbase/dsp/raisedcosine.h
index 8e133ce03..8d2d63088 100644
--- a/sdrbase/dsp/raisedcosine.h
+++ b/sdrbase/dsp/raisedcosine.h
@@ -134,7 +134,7 @@ public:
 private:
     std::vector<Real> m_taps;
     std::vector<Type> m_samples;
-    int m_ptr;
+    unsigned int m_ptr;
 };
 
 #endif // INCLUDE_RAISEDCOSINE_H
diff --git a/sdrbase/dsp/rootraisedcosine.h b/sdrbase/dsp/rootraisedcosine.h
index cb310a150..dee1dbca8 100644
--- a/sdrbase/dsp/rootraisedcosine.h
+++ b/sdrbase/dsp/rootraisedcosine.h
@@ -56,8 +56,6 @@ public:
         m_taps.resize(nTaps / 2 + 1);
 
         // calculate filter taps
-        double Ne = (nTaps-1) / 2;
-
         for(i = 0; i < nTaps / 2 + 1; i++)
         {
             double t = (i - (nTaps / 2)) / (double)samplesPerSymbol;
@@ -136,7 +134,7 @@ public:
 private:
     std::vector<Real> m_taps;
     std::vector<Type> m_samples;
-    int m_ptr;
+    unsigned int m_ptr;
 };
 
 #endif // INCLUDE_ROOTRAISEDCOSINE_H