aboutsummaryrefslogtreecommitdiffstats
path: root/src/DabMod.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2017-10-04 18:57:50 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2017-10-04 18:57:50 +0200
commite21884ad871f52bcd02fc492084bade3dfab275a (patch)
tree2a97768de2fc19ec680f5fbeeccc88163f2aa397 /src/DabMod.cpp
parentecf405846aec3ce7455f68379d86d6888b135c50 (diff)
downloaddabmod-e21884ad871f52bcd02fc492084bade3dfab275a.tar.gz
dabmod-e21884ad871f52bcd02fc492084bade3dfab275a.tar.bz2
dabmod-e21884ad871f52bcd02fc492084bade3dfab275a.zip
Actually enable the new warnings for C++
Diffstat (limited to 'src/DabMod.cpp')
-rw-r--r--src/DabMod.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp
index 15b3be2..2caba5d 100644
--- a/src/DabMod.cpp
+++ b/src/DabMod.cpp
@@ -170,9 +170,9 @@ static void printModSettings(const mod_settings_t& mod_settings)
fprintf(stderr, " Sampling rate: ");
if (mod_settings.outputRate > 1000) {
if (mod_settings.outputRate > 1000000) {
- fprintf(stderr, "%.4g MHz\n", mod_settings.outputRate / 1000000.0f);
+ fprintf(stderr, "%.4g MHz\n", mod_settings.outputRate / 1000000.0);
} else {
- fprintf(stderr, "%.4g kHz\n", mod_settings.outputRate / 1000.0f);
+ fprintf(stderr, "%.4g kHz\n", mod_settings.outputRate / 1000.0);
}
} else {
fprintf(stderr, "%zu Hz\n", mod_settings.outputRate);
@@ -190,11 +190,11 @@ static shared_ptr<ModOutput> prepare_output(
}
if (s.fileOutputFormat == "complexf_normalised") {
if (s.gainMode == GainMode::GAIN_FIX)
- s.normalise = 1.0 / normalise_factor_file_fix;
+ s.normalise = 1.0f / normalise_factor_file_fix;
else if (s.gainMode == GainMode::GAIN_MAX)
- s.normalise = 1.0 / normalise_factor_file_max;
+ s.normalise = 1.0f / normalise_factor_file_max;
else if (s.gainMode == GainMode::GAIN_VAR)
- s.normalise = 1.0 / normalise_factor_file_var;
+ s.normalise = 1.0f / normalise_factor_file_var;
output = make_shared<OutputFile>(s.outputName);
}
else if (s.fileOutputFormat == "s8" or