fill notes

jimomulloy · Apr 21, 2024 · cf4f9d7 · cf4f9d7
1 parent 459cb3b
commit cf4f9d7
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/instrument-core/src/main/java/jomu/instrument/perception/Hearing.java b/instrument-core/src/main/java/jomu/instrument/perception/Hearing.java
@@ -932,7 +932,6 @@ public boolean process(AudioEvent audioEvent) {
 						firstTime = false;
 					}
 					calibrationMap.put(audioEvent.getTimeStamp(), result);
-					LOG.severe(">>CALIB FILE: " + result + ", " + audioEvent.getTimeStamp());
 
 					double startTimeMS = audioEvent.getTimeStamp() * 1000;
 					if (startTimeMS > range) {
@@ -1257,7 +1256,6 @@ public boolean process(AudioEvent audioEvent) {
 						firstTime = false;
 					}
 					calibrationMap.put(audioEvent.getTimeStamp(), result);
-					LOG.severe(">>CALIB MIKE: " + result + ", " + audioEvent.getTimeStamp());
 
 					double startTimeMS = audioEvent.getTimeStamp() * 1000;
 					if (startTimeMS > range) {

diff --git a/instrument-core/src/main/resources/instrument-chords.properties b/instrument-core/src/main/resources/instrument-chords.properties
@@ -32,4 +32,3 @@ perception.hearing.maximumFrequencyInCents=9000
 perception.hearing.microToneSwitch=false
 perception.hearing.notate.applyFormantsSwitch=true
 perception.hearing.synthesis.fillChordsSwitch=true
-perception.hearing.synthesis.fillNotesSwitch=true
diff --git a/instrument-core/src/main/resources/instrument-synth.properties b/instrument-core/src/main/resources/instrument-synth.properties
@@ -0,0 +1,38 @@
+#Sun Apr 21 15:18:37 BST 2024
+actuation.voice.midiDevicePlaySwitch=true
+actuation.voice.playMidi=true
+audio.tuner.formantFactor=94
+audio.tuner.formantHigh=97
+audio.tuner.formantLow=71
+audio.tuner.formantMid=83
+audio.tuner.harmonicOperatorSwitch=true
+audio.tuner.n1Switch=true
+audio.tuner.n2Switch=true
+audio.tuner.n3Switch=true
+audio.tuner.n4Switch=true
+audio.tuner.n5Switch=true
+audio.tuner.n6Switch=true
+audio.tuner.noteLow=3
+audio.tuner.noteMinDuration=885
+audio.tuner.noteSustain=501
+control.parameter.style=chords
+monitor.tonemap.view.highThreshold=0.69
+monitor.tonemap.view.lowThreshold=0.0001
+monitor.view.pitchAxisOffset=4000
+monitor.view.pitchAxisRange=8000
+monitor.view.timeAxisRange=10107
+perception.hearing.audioDefaultFile=abide.wav
+perception.hearing.audioRange=14000
+perception.hearing.autocorrelation.sacfSwitch=false
+perception.hearing.autocorrelation.undertoneRemoveSwitch=false
+perception.hearing.cq.lowThreshold=0.01
+perception.hearing.cq.postHarmonicsSwitch=true
+perception.hearing.cq.sharpenHarmonicSwitch=true
+perception.hearing.cq.whitenCompensateSwitch=true
+perception.hearing.hps.harmonicMedian=9
+perception.hearing.hps.harmonicWeighting=75
+perception.hearing.hps.medianSwitch=false
+perception.hearing.maximumFrequencyInCents=9000
+perception.hearing.microToneSwitch=false
+perception.hearing.notate.compressionSwitch=false
+perception.hearing.synthesis.fillChordsSwitch=true
diff --git a/instrument-desktop/src/main/java/jomu/instrument/desktop/monitor/swing/ParametersPanel.java b/instrument-desktop/src/main/java/jomu/instrument/desktop/monitor/swing/ParametersPanel.java
@@ -52,7 +52,8 @@ public class ParametersPanel extends JPanel {
 	private static final Logger LOG = Logger.getLogger(ParametersPanel.class.getName());
 
 	private final static Integer[] fftSizes = { 256, 512, 1024, 2048, 4096, 8192, 16384, 22050, 32768, 65536, 131072 };
-	private final static String[] styles = { "default", "chords", "normalised", "ensemble", "guitar", "piano", "vocal",
+	private final static String[] styles = { "default", "chords", "synth", "normalised", "ensemble", "guitar", "piano",
+			"vocal",
 			"vocal-folk", "vocal-male", "vocal-female", "tapes", "tapes-fast", "robin", "birds", "blackbird",
 			"bird-alt1",
 			"bird-best", "bird-scaled", "bird-mix", "classical", "folk", "folky", "folky-clean", "folk-pluck", "bach",