Merge pull request #698 from roderickvd/fix-basic-normalisation

Author: sashahilton00

playback/src/player.rs

@@ -246,7 +246,7 @@ impl NormalisationData {
             let limited_normalisation_power = Self::ratio_to_db(limited_normalisation_factor);
 
             if config.normalisation_method == NormalisationMethod::Basic {
-                warn!("Limiting gain to {:.2} for the duration of this track to stay under normalisation threshold.", limited_normalisation_power);
+                warn!("Limiting gain to {:.2} dB for the duration of this track to stay under normalisation threshold.", limited_normalisation_power);
                 normalisation_factor = limited_normalisation_factor;
             } else {
                 warn!(
@@ -1161,8 +1161,8 @@ impl PlayerInternal {
                         }
 
                         if self.config.normalisation
-                            && (f32::abs(normalisation_factor - 1.0) < f32::EPSILON
-                                || self.config.normalisation_method != NormalisationMethod::Basic)
+                            && !(f32::abs(normalisation_factor - 1.0) <= f32::EPSILON
+                                && self.config.normalisation_method == NormalisationMethod::Basic)
                         {
                             for sample in data.iter_mut() {
                                 let mut actual_normalisation_factor = normalisation_factor;