From 80bc23a3af6c147890aa917921655ee196a83a34 Mon Sep 17 00:00:00 2001
From: Stephane Letz <letz@grame.fr>
Date: Fri, 29 Apr 2011 09:15:03 +0200
Subject: [PATCH] Should compile on Linux.

---
 linux/alsa/JackAlsaDriver.cpp       | 4 ++--
 linux/firewire/JackFFADODriver.cpp  | 2 +-
 linux/freebob/JackFreebobDriver.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp
index 4bb3cbad..9f5c49e1 100644
--- a/linux/alsa/JackAlsaDriver.cpp
+++ b/linux/alsa/JackAlsaDriver.cpp
@@ -94,7 +94,7 @@ void JackAlsaDriver::UpdateLatencies()
 int JackAlsaDriver::Attach()
 {
     JackPort* port;
-    int port_index;
+    jack_port_id_t port_index;
     unsigned long port_flags = (unsigned long)CaptureDriverFlags;
     char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
     char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
@@ -116,7 +116,7 @@ int JackAlsaDriver::Attach()
     for (int i = 0; i < fCaptureChannels; i++) {
         snprintf(alias, sizeof(alias) - 1, "%s:%s:out%d", fAliasName, fCaptureDriverName, i + 1);
         snprintf(name, sizeof(name) - 1, "%s:capture_%d", fClientControl.fName, i + 1);
-        if if (fEngine->PortRegister(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize, &port_index) < 0) {
+        if (fEngine->PortRegister(fClientControl.fRefNum, name, JACK_DEFAULT_AUDIO_TYPE, (JackPortFlags)port_flags, fEngineControl->fBufferSize, &port_index) < 0) {
             jack_error("driver: cannot register port for %s", name);
             return -1;
         }
diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
index c122690a..c133fead 100644
--- a/linux/firewire/JackFFADODriver.cpp
+++ b/linux/firewire/JackFFADODriver.cpp
@@ -346,7 +346,7 @@ JackFFADODriver::ffado_driver_delete (ffado_driver_t *driver)
 int JackFFADODriver::Attach()
 {
     JackPort* port;
-    int port_index;
+    jack_port_id_t port_index;
     char buf[JACK_PORT_NAME_SIZE];
     char portname[JACK_PORT_NAME_SIZE];
     jack_latency_range_t range;
diff --git a/linux/freebob/JackFreebobDriver.cpp b/linux/freebob/JackFreebobDriver.cpp
index 06bc623c..b9e6ce38 100644
--- a/linux/freebob/JackFreebobDriver.cpp
+++ b/linux/freebob/JackFreebobDriver.cpp
@@ -667,7 +667,7 @@ JackFreebobDriver::freebob_driver_midi_finish (freebob_driver_midi_handle_t *m)
 int JackFreebobDriver::Attach()
 {
     JackPort* port;
-    int port_index;
+    jack_port_id_t port_index;
 
     char buf[JACK_PORT_NAME_SIZE];
     char portname[JACK_PORT_NAME_SIZE];