From 459cb3bda66f2500f05d9a3390d3971371a468fd Mon Sep 17 00:00:00 2001 From: Jim O'Mulloy Date: Sat, 20 Apr 2024 17:19:52 +0100 Subject: [PATCH] notews --- .../workspace/tonemap/NoteTracker.java | 5 --- .../resources/instrument-chords.properties | 35 ++++++++++++++++++ ...es10secA2.mid => PIANO_4CHORD_10secC2.mid} | Bin .../resources/parameter-validation.properties | 2 +- .../monitor/swing/ParametersPanel.java | 2 +- 5 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 instrument-core/src/main/resources/instrument-chords.properties rename instrument-core/src/main/resources/instrumentai/{4notes10secA2.mid => PIANO_4CHORD_10secC2.mid} (100%) diff --git a/instrument-core/src/main/java/jomu/instrument/workspace/tonemap/NoteTracker.java b/instrument-core/src/main/java/jomu/instrument/workspace/tonemap/NoteTracker.java index 3db20df9..c3693ef0 100644 --- a/instrument-core/src/main/java/jomu/instrument/workspace/tonemap/NoteTracker.java +++ b/instrument-core/src/main/java/jomu/instrument/workspace/tonemap/NoteTracker.java @@ -969,11 +969,6 @@ public int compare(ChordNote c1, ChordNote c2) { for (NoteListElement nnle : newNotes) { track.addNote(nnle); if (lastNote != null && lastNote.endTime >= startTime) { - if (track.number == 1) { - LOG.severe(">>CN 2: " + time + ", " + startTime + ", " + lastNote.endTime + ", " - + nnle.startTime); - - } return; } } diff --git a/instrument-core/src/main/resources/instrument-chords.properties b/instrument-core/src/main/resources/instrument-chords.properties new file mode 100644 index 00000000..8f7a5564 --- /dev/null +++ b/instrument-core/src/main/resources/instrument-chords.properties @@ -0,0 +1,35 @@ +#Sat Apr 20 16:47:29 BST 2024 +actuation.voice.midiPlayChord1Switch=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=79 +control.parameter.style=ai-voice-male-best +monitor.tonemap.view.highThreshold=0.69 +monitor.tonemap.view.lowThreshold=0.0001 +monitor.view.showChords=true +monitor.view.timeAxisRange=10107 +perception.hearing.audioDefaultFile=GUITAR_4CHORD_10secC3.mp3 +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.medianSwitch=false +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/instrumentai/4notes10secA2.mid b/instrument-core/src/main/resources/instrumentai/PIANO_4CHORD_10secC2.mid similarity index 100% rename from instrument-core/src/main/resources/instrumentai/4notes10secA2.mid rename to instrument-core/src/main/resources/instrumentai/PIANO_4CHORD_10secC2.mid diff --git a/instrument-core/src/main/resources/parameter-validation.properties b/instrument-core/src/main/resources/parameter-validation.properties index 2d61f361..b4e95b4d 100644 --- a/instrument-core/src/main/resources/parameter-validation.properties +++ b/instrument-core/src/main/resources/parameter-validation.properties @@ -98,7 +98,7 @@ perception.hearing.notate.compression=0>100 perception.hearing.synthesis.quantizeRange=0>10000 perception.hearing.synthesis.quantizePercent=0>100 -perception.hearing.synthesis.quantizeBeat=0>16 +perception.hearing.synthesis.quantizeBeat=1>16 perception.hearing.synthesis.minTimeIncrement=0>10 perception.hearing.synthesis.baseMeasure=0>100 perception.hearing.synthesis.baseOctave=0>12 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 index b7d15e33..adda8ff8 100644 --- 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,7 @@ 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", "normalised", "ensemble", "guitar", "piano", "vocal", + private final static String[] styles = { "default", "chords", "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",