From dc3b357245e17b4e91cbbfb9a2fd1074f83592f7 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Fri, 1 Feb 2008 12:20:33 +0000
Subject: [PATCH] WindowsWindows compilation

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1813 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/JackPortAudioDriver.cpp           | 3 ++-
 windows/JackWinNamedPipeClientChannel.cpp | 4 ++--
 windows/JackWinNamedPipeClientChannel.h   | 2 +-
 windows/JackWinNamedPipeServerChannel.cpp | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/windows/JackPortAudioDriver.cpp b/windows/JackPortAudioDriver.cpp
index ae35c491..b5862e96 100644
--- a/windows/JackPortAudioDriver.cpp
+++ b/windows/JackPortAudioDriver.cpp
@@ -28,7 +28,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackEngineControl.h"
 #include "JackError.h"
 #include "JackTime.h"
-#include <iostream>
+#include <iostream>
+#include <assert.h>
 
 namespace Jack
 {
diff --git a/windows/JackWinNamedPipeClientChannel.cpp b/windows/JackWinNamedPipeClientChannel.cpp
index 0192f214..bbc4d42d 100644
--- a/windows/JackWinNamedPipeClientChannel.cpp
+++ b/windows/JackWinNamedPipeClientChannel.cpp
@@ -182,7 +182,7 @@ void JackWinNamedPipeClientChannel::ClientDeactivate(int refnum, int* result)
     ServerSyncCall(&req, &res, result);
 }
 
-void JackWinNamedPipeClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result)
+void JackWinNamedPipeClientChannel::PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result)
 {
     JackPortRegisterRequest req(refnum, name, type, flags, buffer_size);
     JackPortRegisterResult res;
@@ -310,7 +310,7 @@ bool JackWinNamedPipeClientChannel::Execute()
         goto error;
     }
 
-    res.fResult = fClient->ClientNotify(event.fRefNum, event.fName, event.fNotify, event.fSync, event.fValue);
+    res.fResult = fClient->ClientNotify(event.fRefNum, event.fName, event.fNotify, event.fSync, event.fValue1, event.fValue2);
 
     if (event.fSync) {
         if (res.Write(&fNotificationListenPipe) < 0) {
diff --git a/windows/JackWinNamedPipeClientChannel.h b/windows/JackWinNamedPipeClientChannel.h
index 7a7654e3..4e01f341 100644
--- a/windows/JackWinNamedPipeClientChannel.h
+++ b/windows/JackWinNamedPipeClientChannel.h
@@ -65,7 +65,7 @@ class JackWinNamedPipeClientChannel : public JackClientChannelInterface, public
         void ClientActivate(int refnum, int* result);
         void ClientDeactivate(int refnum, int* result);
 
-        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, jack_port_id_t* port_index, int* result);
+        void PortRegister(int refnum, const char* name, const char* type, unsigned int flags, unsigned int buffer_size, unsigned int* port_index, int* result);
         void PortUnRegister(int refnum, jack_port_id_t port_index, int* result);
 
         void PortConnect(int refnum, const char* src, const char* dst, int* result);
diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp
index 051df649..672a8235 100644
--- a/windows/JackWinNamedPipeServerChannel.cpp
+++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -102,7 +102,9 @@ int JackClientPipeThread::HandleRequest()
 		jack_error("HandleRequest: cannot read header");
 		ClientKill();
 		ret = -1;
-	} else {
+	} else {
+
+		JackLog("JackClientPipeThread::HandleRequest fType = %ld\n", header.fType);
 
 		// Read data
 		switch (header.fType) {