Attenuate after normalisation

roderickvd · roderickvd · commit 7da4d0e4730e · 2021-09-01T20:54:47.000+02:00
diff --git a/playback/src/player.rs b/playback/src/player.rs
@@ -1186,10 +1186,6 @@ impl PlayerInternal {
             Some(mut packet) => {
                 if !packet.is_empty() {
                     if let AudioPacket::Samples(ref mut data) = packet {
-                        if let Some(ref editor) = self.audio_filter {
-                            editor.modify_stream(data)
-                        }
-
                         if self.config.normalisation
                             && !(f64::abs(normalisation_factor - 1.0) <= f64::EPSILON
                                 && self.config.normalisation_method == NormalisationMethod::Basic)
@@ -1302,6 +1298,10 @@ impl PlayerInternal {
                                 }
                             }
                         }
+
+                        if let Some(ref editor) = self.audio_filter {
+                            editor.modify_stream(data)
+                        }
                     }
 
                     if let Err(err) = self.sink.write(&packet, &mut self.converter) {

Original file line number	Diff line number	Diff line change
`@@ -1186,10 +1186,6 @@ impl PlayerInternal {`
`1186`	`1186`	`Some(mut packet) => {`
`1187`	`1187`	`if !packet.is_empty() {`
`1188`	`1188`	`if let AudioPacket::Samples(ref mut data) = packet {`
`1189`		`- if let Some(ref editor) = self.audio_filter {`
`1190`		`- editor.modify_stream(data)`
`1191`		`- }`
`1192`		`-`
`1193`	`1189`	`if self.config.normalisation`
`1194`	`1190`	`&& !(f64::abs(normalisation_factor - 1.0) <= f64::EPSILON`
`1195`	`1191`	`&& self.config.normalisation_method == NormalisationMethod::Basic)`
`@@ -1302,6 +1298,10 @@ impl PlayerInternal {`
`1302`	`1298`	`}`
`1303`	`1299`	`}`
`1304`	`1300`	`}`
	`1301`	`+`
	`1302`	`+ if let Some(ref editor) = self.audio_filter {`
	`1303`	`+ editor.modify_stream(data)`
	`1304`	`+ }`
`1305`	`1305`	`}`
`1306`	`1306`
`1307`	`1307`	`if let Err(err) = self.sink.write(&packet, &mut self.converter) {`