Make linux modules compile

linux/alsarawmidi/JackALSARawMidiInputPort.h

@@ -22,8 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackALSARawMidiPort.h"
 #include "JackALSARawMidiReceiveQueue.h"
-#include "JackMidiAsyncQueue.h"
-#include "JackMidiBufferWriteQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawInputWriteQueue.h"
 
 namespace Jack {

linux/alsarawmidi/JackALSARawMidiOutputPort.h

@@ -22,8 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "JackALSARawMidiPort.h"
 #include "JackALSARawMidiSendQueue.h"
-#include "JackMidiAsyncQueue.h"
-#include "JackMidiBufferReadQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawOutputWriteQueue.h"
 
 namespace Jack {

linux/alsarawmidi/JackALSARawMidiReceiveQueue.cpp

@@ -21,6 +21,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackError.h"
 #include "JackMidiUtil.h"
 
+/* Somehow the compiler doesn't accept my typedef in JackMidi.h */
+typedef jack_event_data_t            jack_midi_data_t;
+typedef jack_event_t                 jack_midi_event_t;
+
 using Jack::JackALSARawMidiReceiveQueue;
 
 JackALSARawMidiReceiveQueue::

linux/alsarawmidi/JackALSARawMidiReceiveQueue.h

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <alsa/asoundlib.h>
 
-#include "JackMidiReceiveQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {
 

linux/alsarawmidi/JackALSARawMidiSendQueue.h

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include <alsa/asoundlib.h>
 
-#include "JackMidiSendQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {
 

linux/firewire/JackFFADOMidiInputPort.h

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFFADOMidiInputPort__
 
 #include "JackFFADOMidiReceiveQueue.h"
-#include "JackMidiBufferWriteQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawInputWriteQueue.h"
 
 namespace Jack {

linux/firewire/JackFFADOMidiOutputPort.h

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define __JackFFADOMidiOutputPort__
 
 #include "JackFFADOMidiSendQueue.h"
-#include "JackMidiBufferReadQueue.h"
+#include "JackMidi.h"
 #include "JackMidiRawOutputWriteQueue.h"
 
 namespace Jack {

linux/firewire/JackFFADOMidiReceiveQueue.cpp

@@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #include "JackFFADOMidiReceiveQueue.h"
 #include "JackMidiUtil.h"
 
+/* Somehow the compiler doesn't accept my typedef in JackMidi.h */
+typedef jack_event_data_t            jack_midi_data_t;
+typedef jack_event_t                 jack_midi_event_t;
+
 using Jack::JackFFADOMidiReceiveQueue;
 
 JackFFADOMidiReceiveQueue::JackFFADOMidiReceiveQueue()

linux/firewire/JackFFADOMidiReceiveQueue.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackFFADOMidiReceiveQueue__
 #define __JackFFADOMidiReceiveQueue__
 
-#include "JackMidiReceiveQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {
 

linux/firewire/JackFFADOMidiSendQueue.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef __JackFFADOMidiSendQueue__
 #define __JackFFADOMidiSendQueue__
 
-#include "JackMidiSendQueue.h"
+#include "JackMidi.h"
 
 namespace Jack {