From 3bbff1f04778f5cc3c7f1b1b1e08dc7237ed1f72 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 18 Apr 2011 09:19:26 +0000
Subject: [PATCH] WinMME driver compiles again.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4320 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/jackd.workspace                | 4 ++--
 windows/winmme/JackWinMMEInputPort.cpp | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/windows/jackd.workspace b/windows/jackd.workspace
index c55b6e63..d7d8e8d0 100644
--- a/windows/jackd.workspace
+++ b/windows/jackd.workspace
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="jack">
-		<Project filename="libjackserver.cbp" />
+		<Project filename="libjackserver.cbp" active="1" />
 		<Project filename="jack_portaudio.cbp" />
 		<Project filename="jack_netdriver.cbp" />
 		<Project filename="jack_netonedriver.cbp" />
 		<Project filename="jack_dummy.cbp" />
 		<Project filename="jack_netmanager.cbp" />
-		<Project filename="jack_audioadapter.cbp" active="1" />
+		<Project filename="jack_audioadapter.cbp" />
 		<Project filename="libjack.cbp" />
 		<Project filename="jack_load.cbp" />
 		<Project filename="jack_unload.cbp" />
diff --git a/windows/winmme/JackWinMMEInputPort.cpp b/windows/winmme/JackWinMMEInputPort.cpp
index 2c0b43b5..f515ca66 100644
--- a/windows/winmme/JackWinMMEInputPort.cpp
+++ b/windows/winmme/JackWinMMEInputPort.cpp
@@ -21,7 +21,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <memory>
 #include <stdexcept>
 
-#include "JackError.h"
+#include "JackError.h"
+#include "JackTime.h"
 #include "JackMidiUtil.h"
 #include "JackWinMMEInputPort.h"
 #include "JackMidiWriteQueue.h"
@@ -225,7 +226,7 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
                        "status byte.");
             return;
         }
-        EnqueueMessage(dwParam2, (size_t) length, message_buffer);
+        EnqueueMessage(param2, (size_t) length, message_buffer);
         break;
     }
     case MIM_LONGDATA: {
@@ -242,7 +243,7 @@ JackWinMMEInputPort::ProcessWinMME(UINT message, DWORD param1, DWORD param2)
             jack_error("JackWinMMEInputPort::ProcessWinMME - Discarding "
                        "%d-byte sysex chunk.", byte_count);
         } else {
-            EnqueueMessage(dwParam2, byte_count, data);
+            EnqueueMessage(param2, byte_count, data);
         }
         // Is this realtime-safe?  This function isn't run in the JACK thread,
         // but we still want it to perform as quickly as possible.  Even if