From 13b922827dabca138f0c38a1a2fb8eca90bed390 Mon Sep 17 00:00:00 2001 From: Seymour Shlien Date: Thu, 1 Sep 2022 14:06:21 -0400 Subject: [PATCH] 2022.09.01 --- VERSION | 2 +- doc/CHANGES | 5 +++-- doc/readme.txt | 2 +- midi2abc.c | 11 +++-------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/VERSION b/VERSION index d7f4633..599a317 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -August 24 2022 +September 01 2022 diff --git a/doc/CHANGES b/doc/CHANGES index 5673e9f..428f6ac 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -14853,7 +14853,8 @@ Fixed the abc parser so it does not report a malformed note when it encounters a dotted bar line .| -- (in parsemusic() in parseabc.c). The dotted bar line is treated as a regular bar line. -August 23 2022 -midi2abc -midistats introducing channel spread. +August 23 2022, September 01 2022 + +midi2abc -midistats introducing quietTime. diff --git a/doc/readme.txt b/doc/readme.txt index 56e252c..31e2420 100644 --- a/doc/readme.txt +++ b/doc/readme.txt @@ -1,6 +1,6 @@ abcMIDI : abc <-> MIDI conversion utilities -midi2abc version 3.56 August 24 2022 +midi2abc version 3.57 September 01 2022 abc2midi version 4.76 August 01 2022 abc2abc version 2.18 June 14 2022 yaps version 1.90 June 14 2022 diff --git a/midi2abc.c b/midi2abc.c index d37691d..b31215d 100644 --- a/midi2abc.c +++ b/midi2abc.c @@ -45,7 +45,7 @@ * based on public domain 'midifilelib' package. */ -#define VERSION "3.56 August 24 2022 midi2abc" +#define VERSION "3.57 September 01 2022 midi2abc" #include /* Microsoft Visual C++ Version 6.0 or higher */ @@ -1253,13 +1253,6 @@ if (npulses > 0) for (i=1;i<17;i++) printf("%5.2f ",chnactivity[i]/(double) trkdata.npulses[0]); else for (i=0;i<17;i++) printf("%5.2f ",(double) chnactivity[i]); -printf("\nspread "); -for (i=1;i<17;i++) { - delta = trkdata.npulses[0] - trkdata.quietTime[i]; - if (trkdata.quietTime[i] < quietLimit) delta = trkdata.npulses[0]; - delta = delta / (double) trkdata.npulses[0]; - printf (" %5.3f ", delta); - } printf("\npitchentropy %f\n",histogram_entropy(pitchclass_activity,12)); printf("\n"); @@ -1327,6 +1320,8 @@ for (i=0;i<17;i++) { printf("%d %d ",trkdata.notecount[i],trkdata.chordcount[i]); printf("%d %d ",trkdata.notemeanpitch[i], trkdata.notelength[i]); printf("%d %d ",trkdata.cntlparam[i],trkdata.pressure[i]); /* [SS] 2022-03-04 */ + printf("%d ",trkdata.quietTime[i]); /* [SS] 2022.09.01 */ + trkdata.quietTime[i] = 0; printf("\n"); channel2nnotes[i] += trkdata.notecount[i] + trkdata.chordcount[i];