prepeare for merge

diff --git a/midi2.c b/midi2.c
index e23a1bb047ffca9bf410bfad9126198d7442557d..be8ca9e9b2fa17386b8ae552d109e429e45f1109 100644 (file)
--- a/midi2.c
+++ b/midi2.c
@@ -105,9 +105,9 @@ void NewMidiEvent(enum MIDIevent event, int channel, int note, int val) {
     }
     if (!desc) {
       // Nothing found. This is nothing to worry about, but log the key to stderr
-        if (event == MIDI_PITCH) g_print("Unassigned PitchBend Value=%d\n", val);
-        if (event == MIDI_NOTE ) g_print("Unassigned Key Note=%d Val=%d\n", note, val);
-        if (event == MIDI_CTRL ) g_print("Unassigned Controller Ctl=%d Val=%d\n", note, val);
+        if (event == MIDI_PITCH) g_print("%s: Unassigned PitchBend Value=%d\n",__FUNCTION__, val);
+        if (event == MIDI_NOTE ) g_print("%s: Unassigned Key Note=%d Val=%d\n",__FUNCTION__, note, val);
+        if (event == MIDI_CTRL ) g_print("%s: Unassigned Controller Ctl=%d Val=%d\n",__FUNCTION__, note, val);
     }
 }
 

diff --git a/midi3.c b/midi3.c
index ab72d757d33dc870bd53574a9c4f1c395278d5f7..b2e4ca46ba6f19ad3b59fa5f08ce6d68f4300022 100644 (file)
--- a/midi3.c
+++ b/midi3.c
@@ -39,30 +39,16 @@ void DoTheMidi(int action, enum ACTIONtype type, int val) {
 
     switch(type) {
       case MIDI_KEY:
-       //
-       // CW_LEFT, CW_RIGHT, and CW_KEYER have to be handled with
-       // minimum latency, so these are not put to the GTK idle queue
-       // but rather handled immediately
-       //
        if(action==CW_LEFT || action==CW_RIGHT) {
 #ifdef LOCALCW
-         keyer_event(action==CW_LEFT,val);
+          keyer_event(action==CW_LEFT,val);
 #else
-         g_print("MIDI CW key but compiled without LOCALCW\n");
+          g_print("MIDI CW key but compiled without LOCALCW\n");
 #endif
         } else if (action == CW_KEYER) {
           //
-          // This is a CW key-up/down which uses functions from the keyer
-          // that by-pass the interrupt-driven standard action.
-          // It is intended to
-          // be used with external keyers that send key-up/down messages via
-          // MIDI using this command.
-          //
-          // NO BREAK-IN! The keyer has to take care of sending MIDI PTT
-          // on/off messages at appropriate times, or the operator has to
-          // manually engage/disengage PTT
-          //
-          // Since this if for immediate key-down, it does not rely on LOCALCW
+         // hard "key-up/down" action WITHOUT break-in
+         // intended for MIDI keyers which take care of PTT themselves
           //
           if (val != 0 && cw_keyer_internal == 0) {
             cw_key_down=960000;  // max. 20 sec to protect hardware
@@ -72,11 +58,11 @@ void DoTheMidi(int action, enum ACTIONtype type, int val) {
             cw_key_down=0;
             cw_key_up=0;
           }
-       } else {
-         a=g_new(PROCESS_ACTION,1);
-         a->action=action;
-         a->mode=val?PRESSED:RELEASED;
-         g_idle_add(process_action,a);
+        } else {
+          a=g_new(PROCESS_ACTION,1);
+          a->action=action;
+          a->mode=val?PRESSED:RELEASED;
+          g_idle_add(process_action,a);
        }
        break;
       case MIDI_KNOB: