small typo corrections

diff --git a/Makefile b/Makefile
index 155fad4c6e86eaf0b3c1b09750e548d974c870cd..04e21d867d7f501b9f0d9c0325041e88a2aa0f9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -387,7 +387,6 @@ led.h \
 ext.h \
 error_handler.h \
 protocols.h \
-css.h \
 actions.h \
 switch_menu.h \
 gpio.h

diff --git a/alsa_midi.c b/alsa_midi.c
index 808a2bf1dfed060b18fe17464ccedd9228625d17..369b24f121866ec583fd1753ac415f5fb5d7fdbf 100644 (file)
--- a/alsa_midi.c
+++ b/alsa_midi.c
@@ -194,7 +194,7 @@ void register_midi_device(int index) {
     int i;
     int ret=0;
 
-    if (index < 0 || index > MAX_MIDI_DEVICES) return;
+    if (index < 0 || index >= n_midi_devices) return;
 
     g_print("%s: open MIDI device %d\n", __FUNCTION__, index);
 
@@ -221,7 +221,7 @@ void close_midi_device(int index) {
   int ret;
 
   g_print("%s: index=%d\n", __FUNCTION__, index);
-  if (index < 0 || index > MAX_MIDI_DEVICES) return;
+  if (index < 0 || index >= MAX_MIDI_DEVICES) return;
   if (midi_devices[index].active == 0) return;
 
   //

diff --git a/mac_midi.c b/mac_midi.c
index 5336e66ea9610b5a87648ac6241fbbc57955c7ee..459e2a1cdd714e0d90adb480e90394ed210eda72 100644 (file)
--- a/mac_midi.c
+++ b/mac_midi.c
@@ -189,7 +189,8 @@ static MIDIClientRef myClients[MAX_MIDI_DEVICES];
 
 void close_midi_device(index) {
     fprintf(stderr,"%s index=%d\n",__FUNCTION__, index);
-    if (index < 0 || index > n_midi_devices) return;
+    if (index < 0 || index >= MAX_MIDI_DEVICES) return;
+    if (midi_devices[index].active == 0) return;
     //
     // This should release the resources associated with the pending connection
     //
@@ -204,7 +205,7 @@ void register_midi_device(int index) {
 //
 //  Register a callback routine for the device
 //
-    if (index < 0 || index > MAX_MIDI_DEVICES) return;
+    if (index < 0 || index >= n_midi_devices) return;
 
      myClients[index]=0;
      myMIDIports[index] = 0;

diff --git a/midi2.c b/midi2.c
index 7fa75d0e6672e7b0f99b40f114cc72877a46d295..ebc6f6393d9eb9ac00140004b62bcf85f5af4a38 100644 (file)
--- a/midi2.c
+++ b/midi2.c
@@ -252,7 +252,7 @@ static void keyword2action(char *s, enum MIDIaction *action, int *onoff) {
           return;
         }
     }
-    fprintf(stderr,"MIDI: action keyword %s NOT FOUND.\n", s);
+    g_print("%s: action keyword %s NOT FOUND.\n", __FUNCTION__, s);
     *action = MIDI_ACTION_NONE;
     *onoff  = 0;
 }
@@ -337,7 +337,7 @@ int MIDIstartup(char *filename) {
     g_print("%s: %s\n",__FUNCTION__,filename);
     fpin=fopen(filename, "r");
 
-    g_print("%s: fpin=%p\n",__FUNCTION__,fpin);
+    //g_print("%s: fpin=%p\n",__FUNCTION__,fpin);
     if (!fpin) {
       g_print("%s: failed to open MIDI device\n",__FUNCTION__);
       return -1;
@@ -366,12 +366,14 @@ int MIDIstartup(char *filename) {
        cp++;
       }
       
-g_print("\n%s:INP:%s\n",__FUNCTION__,zeile);
-
-      chan=-1;  // default: any channel
-      t1=t3=t5=t7= t9=t11=128;  // range that never occurs
-      t2=t4=t6=t8=t10=t12=-1;   // range that never occurs
-      onoff=0;
+//g_print("\n%s:INP:%s\n",__FUNCTION__,zeile);
+
+      chan=-1;                  // default: any channel
+      t1 = t2 = t3 = t4 = -1;   // default threshold values
+      t5= 0; t6= 63;
+      t7=65; t8=127;
+      t9 = t10 = t11 = t12 = -1;
+      onoff=0;                  // this will be set automatically
       event=MIDI_EVENT_NONE;
       type=MIDI_TYPE_NONE;
       key=0;
@@ -386,24 +388,24 @@ g_print("\n%s:INP:%s\n",__FUNCTION__,zeile);
         sscanf(cp+4, "%d", &key);
         event=MIDI_EVENT_NOTE;
        type=MIDI_TYPE_KEY;
-g_print("%s: MIDI:KEY:%d\n",__FUNCTION__, key);
+//g_print("%s: MIDI:KEY:%d\n",__FUNCTION__, key);
       }
       if ((cp = strstr(zeile, "CTRL="))) {
         sscanf(cp+5, "%d", &key);
        event=MIDI_EVENT_CTRL;
        type=MIDI_TYPE_KNOB;
-g_print("%s: MIDI:CTL:%d\n",__FUNCTION__, key);
+//g_print("%s: MIDI:CTL:%d\n",__FUNCTION__, key);
       }
       if ((cp = strstr(zeile, "PITCH "))) {
         event=MIDI_EVENT_PITCH;
        type=MIDI_TYPE_KNOB;
-g_print("%s: MIDI:PITCH\n",__FUNCTION__);
+//g_print("%s: MIDI:PITCH\n",__FUNCTION__);
       }
       //
       // If event is still undefined, skip line
       //
       if (event == MIDI_EVENT_NONE) {
-//fprintf(stderr,"MIDI:ERR:NO_EVENT\n");
+//g_print("%s: no event found: %s\n", __FUNCTION__, zeile);
        continue;
       }
 
@@ -417,21 +419,21 @@ g_print("%s: MIDI:PITCH\n",__FUNCTION__);
         sscanf(cp+5, "%d", &chan);
        chan--;
         if (chan<0 || chan>15) chan=-1;
-g_print("%s:CHAN:%d\n",__FUNCTION__,chan);
+//g_print("%s:CHAN:%d\n",__FUNCTION__,chan);
       }
       if ((cp = strstr(zeile, "WHEEL")) && (type == MIDI_TYPE_KNOB)) {
        // change type from MIDI_TYPE_KNOB to MIDI_TYPE_WHEEL
         type=MIDI_TYPE_WHEEL;
-g_print("%s:WHEEL\n",__FUNCTION__);
+//g_print("%s:WHEEL\n",__FUNCTION__);
       }
       if ((cp = strstr(zeile, "DELAY="))) {
         sscanf(cp+6, "%d", &delay);
-g_print("%s:DELAY:%d\n",__FUNCTION__,delay);
+//g_print("%s:DELAY:%d\n",__FUNCTION__,delay);
       }
       if ((cp = strstr(zeile, "THR="))) {
         sscanf(cp+4, "%d %d %d %d %d %d %d %d %d %d %d %d",
                &t1,&t2,&t3,&t4,&t5,&t6,&t7,&t8,&t9,&t10,&t11,&t12);
-//fprintf(stderr,"MIDI:THR:%d/%d, %d/%d, %d/%d, %d/%d, %d/%d, %d/%d\n",t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12);
+//g_print("%s: THR:%d/%d, %d/%d, %d/%d, %d/%d, %d/%d, %d/%d\n",__FUNCTION__,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12);
       }
       if ((cp = strstr(zeile, "ACTION="))) {
         // cut zeile at the first blank character following
@@ -439,7 +441,7 @@ g_print("%s:DELAY:%d\n",__FUNCTION__,delay);
         while (*cq != 0 && *cq != '\n' && *cq != ' ' && *cq != '\t') cq++;
        *cq=0;
         keyword2action(cp+7, &action, &onoff);
-g_print("MIDI:ACTION:%s (%d), onoff=%d\n",cp+7, action, onoff);
+//g_print("MIDI:ACTION:%s (%d), onoff=%d\n",cp+7, action, onoff);
       }
       //
       // All data for a descriptor has been read. Construct it!
@@ -469,11 +471,11 @@ g_print("MIDI:ACTION:%s (%d), onoff=%d\n",cp+7, action, onoff);
       // We have a linked list for each key value to speed up searches
       //
       if (event == MIDI_EVENT_PITCH) {
-//fprintf(stderr,"MIDI:TAB:Insert desc=%p in PITCH table\n",desc);
-        MidiAddCommand(129, desc);
+//g_print("%s: Insert desc=%p in CMDS[128] table\n",__FUNCTION__,desc);
+        MidiAddCommand(128, desc);
       }
       if (event == MIDI_EVENT_NOTE || event == MIDI_EVENT_CTRL) {
-g_print("%s:TAB:Insert desc=%p in CMDS[%d] table\n",__FUNCTION__,desc,key);
+//g_print("%s: Insert desc=%p in CMDS[%d] table\n",__FUNCTION__,desc,key);
         MidiAddCommand(key, desc);
       }
     }

diff --git a/old_protocol.c b/old_protocol.c
index c4a0601b58c3fdfe192359b78107f2a683082ff0..bc18040ea72ece5bc6412d201dc4fc4284ffa3ff 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -973,7 +973,6 @@ static int rx1channel;
 static int rx2channel;
 
 static void process_ozy_byte(int b) {
-  int i,j;
   float fsample;
   switch(state) {
     case SYNC_0: