Fix double promotion warnings report by Clang

gqrx-sdr · Jul 24, 2023 · 5d50dab · 5d50dab
1 parent b886467
commit 5d50dab
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/src/applications/gqrx/mainwindow.cpp b/src/applications/gqrx/mainwindow.cpp
@@ -110,7 +110,7 @@ MainWindow::MainWindow(const QString& cfgfile, bool edit_conf, QWidget *parent)
 
     /* create receiver object */
     rx = new receiver("", "", 1);
-    rx->set_rf_freq(144500000.0f);
+    rx->set_rf_freq(144500000.0);
 
     // remote controller
     remote = new RemoteControl();
@@ -1436,7 +1436,7 @@ void MainWindow::setSqlLevel(double level_db)
  */
 double MainWindow::setSqlLevelAuto()
 {
-    double level = rx->get_signal_pwr() + 3.0f;
+    double level = (double)rx->get_signal_pwr() + 3.0;
     if (level > -10.0)  // avoid 0 dBFS
         level = uiDockRxOpt->getSqlLevel();
 

diff --git a/src/applications/gqrx/remote_control.cpp b/src/applications/gqrx/remote_control.cpp
@@ -631,11 +631,11 @@ QString RemoteControl::cmd_get_level(QStringList cmdlist)
     }
     else if (lvl.compare("STRENGTH", Qt::CaseInsensitive) == 0 || lvl.isEmpty())
     {
-        answer = QString("%1\n").arg(signal_level, 0, 'f', 1);
+        answer = QString("%1\n").arg((double)signal_level, 0, 'f', 1);
     }
     else if (lvl.compare("SQL", Qt::CaseInsensitive) == 0)
     {
-        answer = QString("%1\n").arg(squelch_level, 0, 'f', 1);
+        answer = QString("%1\n").arg((double)squelch_level, 0, 'f', 1);
     }
     else if (lvl.compare("AF", Qt::CaseInsensitive) == 0)
     {

diff --git a/src/dsp/fm_deemph.cpp b/src/dsp/fm_deemph.cpp
@@ -76,7 +76,7 @@ void fm_deemph::calculate_iir_taps(double tau)
         double  w_c;    // Digital corner frequency
         double  w_ca;   // Prewarped analog corner frequency
         double  k, z1, p1, b0;
-        double  fs = d_quad_rate;
+        double  fs = (double)d_quad_rate;
 
         w_c = 1.0 / tau;
         w_ca = 2.0 * fs * tan(w_c / (2.0 * fs));

diff --git a/src/dsp/stereo_demod.cpp b/src/dsp/stereo_demod.cpp
@@ -55,35 +55,35 @@ stereo_demod::stereo_demod(float input_rate, float audio_rate, bool stereo, bool
     d_oirt(oirt)
 {
   double cutof_freq = d_oirt ? 15e3 : 17e3;
-  lpf0 = make_lpf_ff(d_input_rate, cutof_freq, 2e3); // FIXME
+  lpf0 = make_lpf_ff((double)d_input_rate, cutof_freq, 2e3); // FIXME
   audio_rr0 = make_resampler_ff(d_audio_rate/d_input_rate);
   deemph0 = make_fm_deemph(d_audio_rate, 50.0e-6);
 
   if (d_stereo)
   {
-    lpf1 = make_lpf_ff(d_input_rate, cutof_freq, 2e3, -2.1); // FIXME
+    lpf1 = make_lpf_ff((double)d_input_rate, cutof_freq, 2e3, -2.1); // FIXME
     audio_rr1 = make_resampler_ff(d_audio_rate/d_input_rate);
     deemph1 = make_fm_deemph(d_audio_rate, 50.0e-6);
 
     if (!d_oirt)
     {
         d_tone_taps = gr::filter::firdes::complex_band_pass(
-                                       1.0,          // gain,
-		                                   d_input_rate, // sampling_freq
-                                       18980.,       // low_cutoff_freq
-                                       19020.,       // high_cutoff_freq
-                                       5000.);       // transition_width
+                                       1.0,                  // gain,
+		                                   (double)d_input_rate, // sampling_freq
+                                       18980.,               // low_cutoff_freq
+                                       19020.,               // high_cutoff_freq
+                                       5000.);               // transition_width
         pll = gr::analog::pll_refout_cc::make(0.0002,    // loop_bw FIXME
                                 2 * (float)M_PI * 19020 / input_rate,  // max_freq
                                 2 * (float)M_PI * 18980 / input_rate); // min_freq
         subtone = gr::blocks::multiply_cc::make();
     } else {
         d_tone_taps = gr::filter::firdes::complex_band_pass(
-                                       1.0,          // gain,
-                                       d_input_rate, // sampling_freq
-                                       31200.,       // low_cutoff_freq
-                                       31300.,       // high_cutoff_freq
-                                       5000.);       // transition_width
+                                       1.0,                  // gain,
+                                       (double)d_input_rate, // sampling_freq
+                                       31200.,               // low_cutoff_freq
+                                       31300.,               // high_cutoff_freq
+                                       5000.);               // transition_width
         pll = gr::analog::pll_refout_cc::make(0.0002,    // loop_bw FIXME
                                 2 * (float)M_PI * 31200 / input_rate,  // max_freq
                                 2 * (float)M_PI * 31300 / input_rate); // min_freq

diff --git a/src/receivers/nbrx.cpp b/src/receivers/nbrx.cpp
@@ -42,11 +42,11 @@ nbrx::nbrx(float quad_rate, float audio_rate)
 {
     iq_resamp = make_resampler_cc(PREF_QUAD_RATE/d_quad_rate);
 
-    nb = make_rx_nb_cc(PREF_QUAD_RATE, 3.3, 2.5);
-    filter = make_rx_filter(PREF_QUAD_RATE, -5000.0, 5000.0, 1000.0);
-    agc = make_rx_agc_cc(PREF_QUAD_RATE, true, -100, 0, 0, 500, false);
+    nb = make_rx_nb_cc((double)PREF_QUAD_RATE, 3.3, 2.5);
+    filter = make_rx_filter((double)PREF_QUAD_RATE, -5000.0, 5000.0, 1000.0);
+    agc = make_rx_agc_cc((double)PREF_QUAD_RATE, true, -100, 0, 0, 500, false);
     sql = gr::analog::simple_squelch_cc::make(-150.0, 0.001);
-    meter = make_rx_meter_c(PREF_QUAD_RATE);
+    meter = make_rx_meter_c((double)PREF_QUAD_RATE);
     demod_raw = gr::blocks::complex_to_float::make(1);
     demod_ssb = gr::blocks::complex_to_real::make(1);
     demod_fm = make_rx_demod_fm(PREF_QUAD_RATE, 5000.0, 75.0e-6);

diff --git a/src/receivers/wfmrx.cpp b/src/receivers/wfmrx.cpp
@@ -42,16 +42,16 @@ wfmrx::wfmrx(float quad_rate, float audio_rate)
 {
     iq_resamp = make_resampler_cc(PREF_QUAD_RATE/d_quad_rate);
 
-    filter = make_rx_filter(PREF_QUAD_RATE, -80000.0, 80000.0, 20000.0);
+    filter = make_rx_filter((double)PREF_QUAD_RATE, -80000.0, 80000.0, 20000.0);
     sql = gr::analog::simple_squelch_cc::make(-150.0, 0.001);
-    meter = make_rx_meter_c(PREF_QUAD_RATE);
+    meter = make_rx_meter_c((double)PREF_QUAD_RATE);
     demod_fm = make_rx_demod_fm(PREF_QUAD_RATE, 75000.0, 0.0);
     stereo = make_stereo_demod(PREF_QUAD_RATE, d_audio_rate, true);
     stereo_oirt = make_stereo_demod(PREF_QUAD_RATE, d_audio_rate, true, true);
     mono = make_stereo_demod(PREF_QUAD_RATE, d_audio_rate, false);
 
     /* create rds blocks but dont connect them */
-    rds = make_rx_rds(PREF_QUAD_RATE);
+    rds = make_rx_rds((double)PREF_QUAD_RATE);
     rds_decoder = gr::rds::decoder::make(0, 0);
     rds_parser = gr::rds::parser::make(0, 0, 0);
     rds_store = make_rx_rds_store();