zynaddsubfx

commit e262dd0332ff70bba5eb2ea3b1ac0f0c24382622
parent cc7c8c399baa71df3b18cb614375a11ed6f9fd1f
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Fri,  4 Sep 2009 08:10:32 -0400

Added patch from Alexis Ballier to fix NULLMidiIn prototype error

Diffstat:
M
AUTHORS.txt
 | 
2
+-
M
ChangeLog
 | 
3
+++
M
src/Input/NULLMidiIn.cpp
 | 
2
+-
M
src/Input/NULLMidiIn.h
 | 
2
+-

4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -12,5 +12,5 @@ Contributors:
         Emmanuel Saracco (fix for JACK output)
         Achim Settelmeier (QUERTZ keyboard layout for virtual keyboard)
         J�r�mie Andr�i (AZERTY keyboard layout, Array index fix)
-        Alexis Ballier (const char* <-> string mismatch)
+        Alexis Ballier (const char* <-> string mismatch, NULLMidi prototype fix)
 
diff --git a/ChangeLog b/ChangeLog
@@ -886,3 +886,6 @@
 
 02 Sep 2009 (Mark McCurry)
 	    - Incorperated const char* <-> string mismatch by Alexis Ballier 
+	    
+04 Sep 2009 (Mark McCurry)
+	    - Incorperated NULLMidiIn function prototype fix by Alexis Ballier
diff --git a/src/Input/NULLMidiIn.cpp b/src/Input/NULLMidiIn.cpp
@@ -34,7 +34,7 @@ NULLMidiIn::~NULLMidiIn()
  * Get the midi command,channel and parameters
  * It returns MidiNull because it is a dummy driver
  */
-void NULLMidiIn::getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,unsigned char *cmdparams)
+void NULLMidiIn::getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,int *cmdparams)
 {
     cmdtype=MidiNull;
 };
diff --git a/src/Input/NULLMidiIn.h b/src/Input/NULLMidiIn.h
@@ -39,7 +39,7 @@ public:
     /**Get the midi command,channel and parameters
      * It returns MidiNull because it is a dummy driver
      */
-    void getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,unsigned char *cmdparams);
+    void getmidicmd(MidiCmdType &cmdtype,unsigned char &cmdchan,int *cmdparams);
 
 private:
 };