From 9619fd574ea2c33b768edabb16f494870c381c12 Mon Sep 17 00:00:00 2001
From: Matt Jenkins <matt@majenko.co.uk>
Date: Wed, 17 Jul 2019 23:13:39 +0100
Subject: [PATCH] Apply default effect to room noise

---
 ExampleFilters/alien.eff                       |  4 +++-
 ExampleFilters/bigecho.eff                     |  4 +++-
 ExampleFilters/cuthum.eff                      |  4 +++-
 ExampleFilters/cuthumagc.eff                   |  4 +++-
 ExampleFilters/ethereal.eff                    |  4 +++-
 ExampleFilters/largeroom.eff                   |  6 ++++--
 ExampleFilters/largeroomloud.eff               | 18 ++++++++++++++++++
 ExampleFilters/phone.eff                       |  4 +++-
 ExampleFilters/radio.eff                       |  4 +++-
 ExampleFilters/robotic.eff                     |  4 +++-
 .../audiobookrecorder/AudiobookRecorder.java   |  2 ++
 11 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 ExampleFilters/largeroomloud.eff

diff --git a/ExampleFilters/alien.eff b/ExampleFilters/alien.eff
index 0263653..1cdae2e 100644
--- a/ExampleFilters/alien.eff
+++ b/ExampleFilters/alien.eff
@@ -1,5 +1,7 @@
 <effect name="Alien">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <biquad type="lowpass" fc="10000" q="1" gain="-10" />
     <lfo frequency="100" depth="0.5" />
 </effect>
diff --git a/ExampleFilters/bigecho.eff b/ExampleFilters/bigecho.eff
index 6be4de4..6d90b62 100644
--- a/ExampleFilters/bigecho.eff
+++ b/ExampleFilters/bigecho.eff
@@ -1,5 +1,7 @@
 <effect name="Big Echo">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <delayline>
         <delay samples="22000" gain="0.2" pan="-0.3">
             <biquad type="highpass" fc="300" q="1" gain="0" />
diff --git a/ExampleFilters/cuthum.eff b/ExampleFilters/cuthum.eff
index d002e38..d916c0e 100644
--- a/ExampleFilters/cuthum.eff
+++ b/ExampleFilters/cuthum.eff
@@ -1,4 +1,6 @@
 <effect name="Cut Computer Hum">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <biquad type="lowpass" fc="10000" q="1" gain="-10" />
 </effect>
diff --git a/ExampleFilters/cuthumagc.eff b/ExampleFilters/cuthumagc.eff
index 09c1030..9bd6900 100644
--- a/ExampleFilters/cuthumagc.eff
+++ b/ExampleFilters/cuthumagc.eff
@@ -1,5 +1,7 @@
 <effect name="Cut Computer Hum (with AGC)">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <biquad type="lowpass" fc="10000" q="1" gain="-10" />
     <agc ceiling="0.666" limit="1" attack="0.1" decay="0.01" />
 </effect>
diff --git a/ExampleFilters/ethereal.eff b/ExampleFilters/ethereal.eff
index 8ef4716..04d25bb 100644
--- a/ExampleFilters/ethereal.eff
+++ b/ExampleFilters/ethereal.eff
@@ -1,5 +1,7 @@
 <effect name="Ethereal Voice">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <amplifier gain="0.1" />
     <delayline>
         <delay samples="2000" gain="1.0" pan="-0.3">
diff --git a/ExampleFilters/largeroom.eff b/ExampleFilters/largeroom.eff
index fa89912..75cdbb1 100644
--- a/ExampleFilters/largeroom.eff
+++ b/ExampleFilters/largeroom.eff
@@ -1,5 +1,7 @@
-<effect name="Large Room">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+<effect name="Large Room (quiet)">
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <biquad type="lowpass" fc="10000" q="1" gain="-10" />
     <delayline>
         <delay samples="5500" gain="0.2" pan="-0.3">
diff --git a/ExampleFilters/largeroomloud.eff b/ExampleFilters/largeroomloud.eff
new file mode 100644
index 0000000..a0d952d
--- /dev/null
+++ b/ExampleFilters/largeroomloud.eff
@@ -0,0 +1,18 @@
+<effect name="Large Room (loud)">
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
+    <biquad type="lowpass" fc="10000" q="1" gain="-10" />
+    <delayline>
+        <delay samples="5500" gain="0.2" pan="-0.3">
+            <biquad type="highpass" fc="300" q="1" gain="0" />
+        </delay>
+        <delay samples="11000" gain="0.05" pan="0.3">
+            <biquad type="highpass" fc="600" q="1" gain="0" />
+        </delay>
+        <delay samples="16500" gain="0.01" pan="0.0">
+            <biquad type="highpass" fc="600" q="1" gain="0" />
+        </delay>
+    </delayline>
+    <amplifier gain="0.9" />
+</effect>
diff --git a/ExampleFilters/phone.eff b/ExampleFilters/phone.eff
index 073fbfe..ed935ca 100644
--- a/ExampleFilters/phone.eff
+++ b/ExampleFilters/phone.eff
@@ -1,5 +1,7 @@
 <effect name="Telephone">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <biquad type="lowshelf" fc="400" q="10" gain="-20" />
     <biquad type="highshelf" fc="8000" q="10" gain="-20" />
     <delayline>
diff --git a/ExampleFilters/radio.eff b/ExampleFilters/radio.eff
index 4f68d60..853d323 100644
--- a/ExampleFilters/radio.eff
+++ b/ExampleFilters/radio.eff
@@ -1,5 +1,7 @@
 <effect name="Radio">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <amplifier gain="0.1" />
     <biquad type="peak" fc="1000" q="10" gain="45" />
     <lfo frequency="5000" depth="0.3" />
diff --git a/ExampleFilters/robotic.eff b/ExampleFilters/robotic.eff
index 0995e04..be0b1db 100644
--- a/ExampleFilters/robotic.eff
+++ b/ExampleFilters/robotic.eff
@@ -1,5 +1,7 @@
 <effect name="Robotic">
-    <biquad type="notch" fc="140" q="20" gain="-50" />
+    <biquad type="notch" fc="28" q="20" gain="-50" />
+    <biquad type="notch" fc="91" q="20" gain="-50" />
+    <biquad type="notch" fc="120" q="20" gain="-50" />
     <biquad type="lowshelf" fc="100" q="2" gain="-20" />
     <delayline>
         <delay samples="400" gain="1" pan="-0.3" />
diff --git a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
index 8278c53..c030989 100644
--- a/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
+++ b/src/uk/co/majenko/audiobookrecorder/AudiobookRecorder.java
@@ -2106,6 +2106,8 @@ public class AudiobookRecorder extends JFrame {
 
         if (roomNoise == null) return null;
 
+        roomNoise.setEffectChain(defaultEffectChain);
+
         int len = roomNoise.getSampleSize();
         if (len == 0) return null;