2022.05.05

VERSION

@@ -1,2 +1,2 @@
-2022 April 27 2022
+2022 May 05 2022
 

doc/CHANGES

@@ -14731,3 +14731,12 @@ Note that the command instrument=cF is not part of the abc standard
 and abc2svg does not recognize it.
 
 
+April 28 2022
+
+midi2abc: minor change for -stats function
+
+
+May 05 2022
+
+midicopy: introduced new options -nopressure and -nocntrl
+

doc/readme.txt

@@ -1,11 +1,11 @@
 abcMIDI :   abc <-> MIDI conversion utilities
 
-midi2abc version 3.53 April 06 2022
+midi2abc version 3.54 April 28 2022
 abc2midi version 4.72 April 27 2022
 abc2abc  version 2.16 February 22 2022
 yaps     version 1.88 February 22 2022
 abcmatch version 1.80 November 25 2021
-midicopy version 1.37 October 10 2020
+midicopy version 1.38 May 06 2022
 
 24th January 2002
 

midi2abc.c

@@ -45,7 +45,7 @@
  * based on public domain 'midifilelib' package.
  */
 
-#define VERSION "3.53 April 06 2022 midi2abc"
+#define VERSION "3.54 April 28 2022 midi2abc"
 
 #include <limits.h>
 /* Microsoft Visual C++ Version 6.0 or higher */
@@ -732,6 +732,7 @@ void stats_pressure(chan,press)
 int chan, press;
 {
 trkdata.pressure[0]++;
+trkdata.pressure[chan+1]++; /* [SS] 2022.04.28 */
 }
 
 void txt_parameter(chan,control,value)
@@ -1341,7 +1342,7 @@ void stats_trackend()
 {
  trkdata.npulses[tracknum] = Mf_currtime; 
  if (trkdata.npulses[0] < Mf_currtime) trkdata.npulses[0] = Mf_currtime;
- output_track_summary();
+ output_track_summary(); 
 }
 
 
@@ -1426,7 +1427,7 @@ int chan, pitch, press;
   char *key;
   if (prtime(timeunits)) return;
   key = pitch2key(pitch);
-  printf("Channel Pressure %2d   %3s %3d\n",chan+1,key,press);
+  printf("Pressure %2d   %3s %3d\n",chan+1,key,press); /* [SS] 2022.04.28 */
 }
 
 

midicopy.c

@@ -52,7 +52,7 @@
 
 
 
-#define VERSION "1.37 October 10 2020 midicopy"
+#define VERSION "1.38 May 05 2022 midicopy"
 #include "midicopy.h"
 #define NULLFUNC 0
 #define NULL 0
@@ -112,6 +112,8 @@ int chosen_drum = 0;		/* [SS] 2013-10-01 */
 int drumvelocity = 0;		/* [SS] 2013-10-01 */
 int attenuation = 70;           /* [SS] 2017-11-27 */
 int nobends = 0;                /* [SS] 2017-12-15 */
+int nopressure = 0;             /* [SS] 2022-05-05 */
+int nocntrl = 0;                /* [SS] 2022-05-05 */
 int zerochannels = 0;           /* [SS] 2020-10-09 */
 
 long Mf_numbyteswritten = 0L;
@@ -1060,9 +1062,10 @@ chanmessage (int status, int c1, int c2)
 	copy_noteon (chan, c1, c2);
 	break;
       case 0xa0:
-	copy_pressure (chan, c1, c2);
+        if (nopressure == 0) copy_pressure (chan, c1, c2);
 	break;
       case 0xb0:
+        if (nocntrl == 0)
 	copy_parameter (chan, c1, c2);
 	break;
       case 0xe0:
@@ -1073,7 +1076,7 @@ chanmessage (int status, int c1, int c2)
 	copy_program (chan, c1);
 	break;
       case 0xd0:
-	copy_chanpressure (chan, c1);
+        if (nopressure == 0) copy_chanpressure (chan, c1);
 	break;
       }
    }
@@ -1851,6 +1854,8 @@ main (int argc, char *argv[])
       printf ("-focusonchannels n1,n2,...\n"); /* [SS] 2017-11-27 */
       printf ("-attenuation n\n"); /* [SS] 2017-11-27 */
       printf ("-nobends\n"); /* [SS] 2017-11-27 */
+      printf ("-nopressure\n"); /* [SS] 2022-05-05 */
+      printf ("-nocntrl\n"); /* [SS] 2022-05-05 */
       printf ("-indrums n1,n2,... (drums to include)\n"); /* [SS] 2019-12-22 */
       printf ("-xdrums n1,n2,... (drums to exclude)\n"); /* [SS] 2019-12-22 */
       printf ("-onlydrums (only channel 10)\n"); /* [SS] 2019-12-22 */
@@ -2091,6 +2096,12 @@ main (int argc, char *argv[])
   arg = getarg("-nobends",argc,argv);
   if (arg >=0) nobends=1;
 
+  /* [SS] 2022-05-05 */
+  arg = getarg("-nopressure",argc,argv);
+  if (arg >=0) nopressure=1;
+
+  arg = getarg("-nocntrl",argc,argv);
+  if (arg >=0) nocntrl = 1;
 
   repflag = getarg ("-replace", argc, argv);
   if (repflag >= 0)