removed "onoff" flag, this is now hard-coded.

diff --git a/midi.h b/midi.h
index bfce7bef4068909bc09fa06e1dddb180e6d2798a..9a4e562abbd5f03327bd8718d8123d79fa7eaea8 100644 (file)
--- a/midi.h
+++ b/midi.h
@@ -82,25 +82,15 @@ extern OLD_ACTION_TABLE OLD_ActionTable[];
 // a delay: once a wheel event is reported upstream, any such events are suppressed during
 // the delay.
 // 
-// Note that with a MIDI KEY, you can choose that an action is
-// generated only for a NOTE_ON event or both for NOTE_ON and
-// NOTE_OFF. In the first case, if the key is associated to MOX,
-// then MOX is toggled each time the key is pressed. This behaves
-// very much like point-and-clicking the MOX buttion in the GUI.
+// Note that with a MIDI KEY, normally only "Note on" messages
+// are processed, except for the actions
+// CW_KEYER, CW_LEFT, CW_RIGHT, PTT_KEYER which generate actions
+// also for Note-Off.
 //
-// If an action is generated both on NOTE_ON and NOTE_OFF,
-// then MOX is engaged when pressing the key and disengaged
-// when releasing it. For MOX this makes little send but you
-// might want to configure the TUNE button this way.
-// The latter behaviour is triggered when the line assigning the key
-// or "NOTE OFF". The table speficying the behaviour of layer-2 thus
-// contains the key word "ONOFF". This is stored in the field "onoff"
-// in struct desc.
 
 struct desc {
    int               channel;     // -1 for ANY channel
    enum MIDIevent    event;      // type of event (NOTE on/off, Controller change, Pitch value)
-   int               onoff;       // 1: generate upstream event both for Note-on and Note-off
    enum ACTIONtype   type;        // Key, Knob, or Wheel
    int               vfl1,vfl2;   // Wheel only: range of controller values for "very fast left"
    int               fl1,fl2;     // Wheel only: range of controller values for "fast left"

diff --git a/midi2.c b/midi2.c
index d1941a69518368cf7a46f3af5303748fe75215ec..00b400de1cc796341a7d59f8250527ec0c1f3741 100644 (file)
--- a/midi2.c
+++ b/midi2.c
@@ -57,10 +57,22 @@ void NewMidiEvent(enum MIDIevent event, int channel, int note, int val) {
            // Found matching entry
            switch (desc->event) {
                case MIDI_NOTE:
-                   if ((val == 1 || (desc->onoff == 1)) && desc->type == MIDI_KEY) {
-                       DoTheMidi(desc->action, desc->type, val);
-                   }
-                   break;
+                    if (desc->type == MIDI_KEY) {
+                      switch (desc->action) {
+                        case CW_LEFT:
+                        case CW_RIGHT:
+                        case CW_KEYER:
+                        case PTT:
+                          // deliver message for note-on and note-off
+                          DoTheMidi(desc->action, desc->type, val);
+                          break;
+                        default:
+                          // deliver only note-on messages
+                          if (val == 1) DoTheMidi(desc->action, desc->type, val);
+                          break;
+                      }
+                    }
+                    break;
                case MIDI_CTRL:
                    if (desc->type == MIDI_KNOB) {
                        // normalize value to range 0 - 100
@@ -299,7 +311,7 @@ int MIDIstartup(char *filename) {
     int action;
     int chan;
     int t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12;
-    int onoff, delay;
+    int delay;
     struct desc *desc;
     enum ACTIONtype type;
     enum MIDIevent event;
@@ -346,7 +358,6 @@ int MIDIstartup(char *filename) {
       t5= 0; t6= 63;
       t7=65; t8=127;
       t9 = t10 = t11 = t12 = -1;
-      onoff=0;                  // this will be set automatically
       event=EVENT_NONE;
       type=TYPE_NONE;
       key=0;
@@ -414,21 +425,7 @@ int MIDIstartup(char *filename) {
         while (*cq != 0 && *cq != '\n' && *cq != ' ' && *cq != '\t') cq++;
        *cq=0;
         action=keyword2action(cp+7);
-        //
-        // set ONOFF flag automatically
-        //
-        switch (action) {
-          case CW_LEFT:
-          case CW_RIGHT:
-          case CW_KEYER:
-          case PTT_KEYER:
-           onoff=1;
-            break;
-         default:
-           onoff=0;
-           break;
-        }
-//g_print("MIDI:ACTION:%s (%d), onoff=%d\n",cp+7, action, onoff);
+//g_print("MIDI:ACTION:%s (%d)\n",cp+7, action);
       }
       //
       // All data for a descriptor has been read. Construct it!
@@ -438,7 +435,6 @@ int MIDIstartup(char *filename) {
       desc->action = action;
       desc->type = type;
       desc->event = event;
-      desc->onoff = onoff;
       desc->delay = delay;
       desc->vfl1  = t1;
       desc->vfl2  = t2;

diff --git a/midi_menu.c b/midi_menu.c
index e4417ed9bb510b9eebb1710f4df1991bf5c338c3..cfa2326e50a9eab089f89f1f37b84aa81ee598dc 100644 (file)
--- a/midi_menu.c
+++ b/midi_menu.c
@@ -569,7 +569,6 @@ static void add_cb(GtkButton *widget,gpointer user_data) {
   gint i;
   gint type;
   gint action;
-  gint onoff;
 
   if(str_type==NULL) {
     return;
@@ -590,7 +589,6 @@ static void add_cb(GtkButton *widget,gpointer user_data) {
   }
 
   action=NO_ACTION;
-  onoff=0;
   i=0;
   while(ActionTable[i].action!=ACTIONS) {
     if(strcmp(ActionTable[i].str,str_action)==0) {
@@ -608,7 +606,6 @@ static void add_cb(GtkButton *widget,gpointer user_data) {
   desc->action = action; // MIDIaction
   desc->type = type; // MIDItype
   desc->event = thisEvent; // MIDevent
-  desc->onoff = onoff;
   desc->delay = thisDelay;
   desc->vfl1  = thisVfl1;
   desc->vfl2  = thisVfl2;
@@ -644,7 +641,6 @@ static void update_cb(GtkButton *widget,gpointer user_data) {
   char str_channel[16];
   char str_note[16];
   int i;
-  int onoff;
 
   if (current_cmd == NULL) {
     g_print("%s: current_cmd is NULL!\n", __FUNCTION__);
@@ -670,7 +666,6 @@ static void update_cb(GtkButton *widget,gpointer user_data) {
   //g_print("%s: type=%s action=%s\n",__FUNCTION__,str_type,str_action);
 
   thisAction=NO_ACTION;
-  onoff=0;
   i=0;
   while(ActionTable[i].action!=ACTIONS) {
     if(strcmp(ActionTable[i].str,str_action)==0) {
@@ -683,7 +678,6 @@ static void update_cb(GtkButton *widget,gpointer user_data) {
   current_cmd->channel=thisChannel;
   current_cmd->type   =thisType;
   current_cmd->action =thisAction;
-  current_cmd->onoff =onoff;
   current_cmd->delay =thisDelay;
 
   current_cmd->vfl1  =thisVfl1;
@@ -1609,7 +1603,6 @@ void midi_restore_state() {
   gint indices;
   gint channel;
   gint event;
-  gint onoff;
   gint type;
   gint action;
   gint delay;
@@ -1753,16 +1746,12 @@ void midi_restore_state() {
         vfr2=-1;
         if (value) vfr2=atoi(value);
 
-        onoff=0;
-        if (action == CW_LEFT || action == CW_RIGHT || action == CW_KEYER || action == PTT_KEYER) onoff=1;
-
        struct desc *desc = (struct desc *) malloc(sizeof(struct desc));
 
         desc->next     = NULL;
         desc->action   = action; // MIDIaction
         desc->type     = type;   // MIDItype
         desc->event    = event;  // MIDevent
-        desc->onoff    = onoff;
         desc->delay    = delay;
         desc->vfl1     = vfl1;
         desc->vfl2     = vfl2;
@@ -1778,8 +1767,8 @@ void midi_restore_state() {
         desc->vfr2     = vfr2;
         desc->channel  = channel;
 
-//g_print("DESC INIT Note=%3d Action=%3d Type=%3d Event=%3d OnOff=%3d Chan=%3d Delay=%3d THR=%3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
-//        i, action, type, event, onoff, channel, delay,
+//g_print("DESC INIT Note=%3d Action=%3d Type=%3d Event=%3d Chan=%3d Delay=%3d THR=%3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d %3d\n",
+//        i, action, type, event, channel, delay,
 //        vfl1, vfl2, fl1, fl2, lft1, lft2, rgt1, rgt2, fr1, fr2, vfr1, vfr2);
         MidiAddCommand(i, desc);
       }