fixed some bugs

Author: CodeWinAdmin

libmidi/playmidi.c

@@ -9860,7 +9860,7 @@ static void init_rx(int ch)
 
 static void set_rx(int ch, int32 rx, int flag)
 {
-    if (ch > MAX_CHANNELS)
+    if (ch >= MAX_CHANNELS)
     {
         return;
     }
@@ -9877,6 +9877,7 @@ static void set_rx(int ch, int32 rx, int flag)
 #if 0
 static int32 get_rx(int ch, int32 rx)
 {
+    if(ch >= MAX_CHANNELS) {return 0;}
 	return (channel[ch].rx & rx);
 }
 #endif

libmidi/readmidi.c

@@ -1766,11 +1766,11 @@ int parse_sysex_event_multi(uint8 *val, int32 len, MidiEvent *evm)
             return num_events;
         }
 
-        /* drum channel */
-        dp = rhythm_part[(val[5] & 0xF0) >> 4];
-
         /* calculate user drumset number */
-        udn = (val[5] & 0xF0) >> 4;
+        udn = (val[5] & 0x10) >> 4;
+
+        /* drum channel */
+        dp = rhythm_part[udn];
 
         addr_h = val[4];
         addr_m = val[5];

test/timidity.c

@@ -3683,7 +3683,7 @@ parse_opt_h(const char *arg)
     };
     void show_ao_device_info(FILE * fp);
     FILE *fp;
-    char version[32], *help_args[3];
+    char version[128], *help_args[3];
     int i, j;
     char *h;
     ControlMode *cmp, **cmpp;