From 9d08fbdd3ee0e41dd6d13206a31043b72684ada4 Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <terminator356@users.sourceforge.net>
Date: Sun, 1 Sep 2013 21:18:19 -0400
Subject: Midi Input Transformator plugin mods/fixes: Fixed bugs loading
 procVal2Op from song. New! Added 'Program' event type + 'Toggle' processing
 Value#2 operation.

---
 muse2/muse/miditransform.cpp | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'muse2/muse/miditransform.cpp')

diff --git a/muse2/muse/miditransform.cpp b/muse2/muse/miditransform.cpp
index 247fdaf8..f9289dcc 100644
--- a/muse2/muse/miditransform.cpp
+++ b/muse2/muse/miditransform.cpp
@@ -45,7 +45,7 @@ namespace MusECore {
 
 //
 // Order of events:
-// Note, Poly Pressure, Control, AfterTouch, Pitch Bend, NRPN, RPN
+// Note, Poly Pressure, Control, AfterTouch, Pitch Bend, NRPN, RPN, Program
 //
 #define MIDITRANSFORM_NOTE        0
 #define MIDITRANSFORM_POLY        1
@@ -54,11 +54,12 @@ namespace MusECore {
 #define MIDITRANSFORM_PITCHBEND   4
 #define MIDITRANSFORM_NRPN        5
 #define MIDITRANSFORM_RPN         6
+#define MIDITRANSFORM_PROGRAM     7
 
 
 static int eventTypeTable[] = {
       MIDITRANSFORM_NOTE, MIDITRANSFORM_POLY, MIDITRANSFORM_CTRL, MIDITRANSFORM_ATOUCH,
-         MIDITRANSFORM_PITCHBEND, MIDITRANSFORM_NRPN, MIDITRANSFORM_RPN
+         MIDITRANSFORM_PITCHBEND, MIDITRANSFORM_NRPN, MIDITRANSFORM_RPN, MIDITRANSFORM_PROGRAM
       };
 
 static int procVal2Map[] = { 0, 1, 2, 3, 4, 5, 6, 7, 10, 11 };
@@ -543,6 +544,8 @@ void MidiTransformerDialog::transformEvent(MusECore::Event& event, MusECore::Mid
                         val = cmt->procVal1a;
                   }
                   break;
+            default:
+                  break;
             }
       if (val < 0)
             val = 0;
@@ -596,6 +599,7 @@ void MidiTransformerDialog::transformEvent(MusECore::Event& event, MusECore::Mid
             case MusECore::ScaleMap:
             case MusECore::Keep:
             case MusECore::Flip:
+            case MusECore::Toggle:
                   break;
             }
       if (val < 0)
@@ -632,6 +636,7 @@ void MidiTransformerDialog::transformEvent(MusECore::Event& event, MusECore::Mid
             case MusECore::Keep:
             case MusECore::Flip:
             case MusECore::Value:
+            case MusECore::Toggle:
                   break;
             }
       if (len < 0)
@@ -664,6 +669,7 @@ void MidiTransformerDialog::transformEvent(MusECore::Event& event, MusECore::Mid
             case MusECore::Keep:
             case MusECore::Flip:
             case MusECore::Value:
+            case MusECore::Toggle:
                   break;
             }
       if (pos < 0)
@@ -1196,6 +1202,8 @@ void MidiTransformerDialog::procVal1OpSel(int val)
                   procVal1a->setEnabled(true);
                   procVal1b->setEnabled(true);
                   break;
+            default:
+                  break;
             }
       procVal1aChanged(data->cmt->procVal1a);
       procVal1bChanged(data->cmt->procVal1b);
@@ -1209,7 +1217,15 @@ void MidiTransformerDialog::procVal2OpSel(int val)
       {
       MusECore::TransformOperator op = MusECore::TransformOperator(MusECore::procVal2Map[val]);
       data->cmt->procVal2 = op;
+      procVal2OpUpdate(op);
+      }
+
+//---------------------------------------------------------
+//   procVal2OpUpdate
+//---------------------------------------------------------
 
+void MidiTransformerDialog::procVal2OpUpdate(MusECore::TransformOperator op)
+      {
       switch (op) {
             case MusECore::Keep:
             case MusECore::Invert:
@@ -1756,6 +1772,14 @@ bool MidiTransformerDialog::typesMatch(MusECore::Event& e, unsigned selType)
                   matched = (c == MusECore::MidiController::RPN);
                   }
             }
+         case MIDITRANSFORM_PROGRAM:
+            {
+            if (e.type() == MusECore::Controller) {
+                  MusECore::MidiController::ControllerType c = MusECore::midiControllerType(e.dataA());
+                  matched = (c == MusECore::MidiController::Program);
+                  }
+            break;
+            }
          default:
             fprintf(stderr, "Error matching type in MidiTransformerDialog: unknown eventtype!\n");
             break;
-- 
cgit v1.2.3