From 8e55718c3834d458690315c4dba55c93ef6e6145 Mon Sep 17 00:00:00 2001
From: Stephane Letz <letz@grame.fr>
Date: Fri, 1 Apr 2011 10:45:55 +0200
Subject: [PATCH] Winmme driver compiles again.

---
 windows/jack_winmme.cbp                 | 7 +------
 windows/libjackserver.cbp               | 6 ++++++
 windows/winmme/JackWinMMEInputPort.cpp  | 4 +++-
 windows/winmme/JackWinMMEInputPort.h    | 7 ++++---
 windows/winmme/JackWinMMEOutputPort.cpp | 4 ++--
 windows/winmme/JackWinMMEOutputPort.h   | 4 +---
 windows/winmme/JackWinMMEPort.cpp       | 9 ++++-----
 windows/winmme/JackWinMMEPort.h         | 9 +++++----
 8 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/windows/jack_winmme.cbp b/windows/jack_winmme.cbp
index 7de61fa8..7fe93703 100644
--- a/windows/jack_winmme.cbp
+++ b/windows/jack_winmme.cbp
@@ -102,12 +102,6 @@
 			<Add library="libjackserver" />
 			<Add library="winmm" />
 		</Linker>
-		<Unit filename="..\common\JackMidiAsyncQueue.cpp" />
-		<Unit filename="..\common\JackMidiBufferReadQueue.cpp" />
-		<Unit filename="..\common\JackMidiBufferWriteQueue.cpp" />
-		<Unit filename="..\common\JackMidiReadQueue.cpp" />
-		<Unit filename="..\common\JackMidiUtil.cpp" />
-		<Unit filename="..\common\JackMidiWriteQueue.cpp" />
 		<Unit filename="jackwinmme.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
@@ -117,6 +111,7 @@
 		<Unit filename="winmme\JackWinMMEInputPort.h" />
 		<Unit filename="winmme\JackWinMMEOutputPort.cpp" />
 		<Unit filename="winmme\JackWinMMEOutputPort.h" />
+		<Unit filename="winmme\JackWinMMEPort.cpp" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index 89cd2dd3..84b8985d 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -150,8 +150,14 @@
 		<Unit filename="..\common\JackLoopbackDriver.cpp" />
 		<Unit filename="..\common\JackMessageBuffer.cpp" />
 		<Unit filename="..\common\JackMidiAPI.cpp" />
+		<Unit filename="..\common\JackMidiAsyncQueue.cpp" />
+		<Unit filename="..\common\JackMidiBufferReadQueue.cpp" />
+		<Unit filename="..\common\JackMidiBufferWriteQueue.cpp" />
 		<Unit filename="..\common\JackMidiDriver.cpp" />
 		<Unit filename="..\common\JackMidiPort.cpp" />
+		<Unit filename="..\common\JackMidiReadQueue.cpp" />
+		<Unit filename="..\common\JackMidiUtil.cpp" />
+		<Unit filename="..\common\JackMidiWriteQueue.cpp" />
 		<Unit filename="..\common\JackNetInterface.cpp" />
 		<Unit filename="..\common\JackNetTool.cpp" />
 		<Unit filename="..\common\JackPort.cpp" />
diff --git a/windows/winmme/JackWinMMEInputPort.cpp b/windows/winmme/JackWinMMEInputPort.cpp
index 9d72cc42..c3b04453 100644
--- a/windows/winmme/JackWinMMEInputPort.cpp
+++ b/windows/winmme/JackWinMMEInputPort.cpp
@@ -78,16 +78,18 @@ JackWinMMEInputPort::JackWinMMEInputPort(const char *alias_name,
         GetInErrorString(result, error_message);
         goto unprepare_header;
     }
+
     MIDIINCAPS capabilities;
     char *name_tmp;
     result = midiInGetDevCaps(index, &capabilities, sizeof(capabilities));
     if (result != MMSYSERR_NOERROR) {
         WriteInError("JackWinMMEInputPort [constructor]", "midiInGetDevCaps",
                    result);
-        name_tmp = driver_name;
+        name_tmp = (char*) driver_name;
     } else {
         name_tmp = capabilities.szPname;
     }
+
     snprintf(alias, sizeof(alias) - 1, "%s:%s:in%d", alias_name, name_tmp,
              index + 1);
     snprintf(name, sizeof(name) - 1, "%s:capture_%d", client_name, index + 1);
diff --git a/windows/winmme/JackWinMMEInputPort.h b/windows/winmme/JackWinMMEInputPort.h
index a7305340..13eb32a6 100644
--- a/windows/winmme/JackWinMMEInputPort.h
+++ b/windows/winmme/JackWinMMEInputPort.h
@@ -28,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 namespace Jack {
 
-    class JackWinMMEInputPort : public JackRunnableInterface {
+    class JackWinMMEInputPort : public JackWinMMEPort {
 
     private:
 
@@ -53,13 +53,14 @@ namespace Jack {
 
         bool started;
 
-        void
-        WriteOSError(const char *jack_func, const char *os_func);
 
         void
         WriteInError(const char *jack_func, const char *mm_func,
                                 MMRESULT result);
 
+        void
+        GetInErrorString(MMRESULT error, LPTSTR text);
+
     public:
 
         JackWinMMEInputPort(const char *alias_name, const char *client_name,
diff --git a/windows/winmme/JackWinMMEOutputPort.cpp b/windows/winmme/JackWinMMEOutputPort.cpp
index dcc1dd79..51a9ddbd 100644
--- a/windows/winmme/JackWinMMEOutputPort.cpp
+++ b/windows/winmme/JackWinMMEOutputPort.cpp
@@ -77,7 +77,7 @@ JackWinMMEOutputPort::JackWinMMEOutputPort(const char *alias_name,
     if (result != MMSYSERR_NOERROR) {
         WriteOutError("JackWinMMEOutputPort [constructor]", "midiOutGetDevCaps",
                      result);
-        name_tmp = driver_name;
+        name_tmp = (char*)driver_name;
     } else {
         name_tmp = capabilities.szPname;
     }
@@ -369,6 +369,6 @@ JackWinMMEOutputPort::WriteOutError(const char *jack_func, const char *mm_func,
                                    MMRESULT result)
 {
     char error_message[MAXERRORLENGTH];
-    GetMMErrorString(result, error_message);
+    GetOutErrorString(result, error_message);
     jack_error("%s - %s: %s", jack_func, mm_func, error_message);
 }
diff --git a/windows/winmme/JackWinMMEOutputPort.h b/windows/winmme/JackWinMMEOutputPort.h
index 36fa28b1..d43eae35 100644
--- a/windows/winmme/JackWinMMEOutputPort.h
+++ b/windows/winmme/JackWinMMEOutputPort.h
@@ -20,12 +20,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackWinMMEOutputPort__
 #define __JackWinMMEOutputPort__
 
-#include <mmsystem.h>
-#include <windows.h>
-
 #include "JackMidiAsyncQueue.h"
 #include "JackMidiBufferReadQueue.h"
 #include "JackThread.h"
+#include "JackWinMMEPort.h"
 
 namespace Jack {
 
diff --git a/windows/winmme/JackWinMMEPort.cpp b/windows/winmme/JackWinMMEPort.cpp
index 577cfbeb..46c4546b 100644
--- a/windows/winmme/JackWinMMEPort.cpp
+++ b/windows/winmme/JackWinMMEPort.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <stdexcept>
 
 #include "JackWinMMEPort.h"
+#include "JackError.h"
 
 using Jack::JackWinMMEPort;
 
@@ -28,16 +29,14 @@ using Jack::JackWinMMEPort;
 // Class
 ///////////////////////////////////////////////////////////////////////////////
 
-JackWinMMEPort::JackWinMMEPort(const char *alias_name,
-                                    const char *client_name,
-                                    const char *driver_name)
+JackWinMMEPort::JackWinMMEPort()
 {}
 
 JackWinMMEPort::~JackWinMMEPort()
 {}
 
-const JackWinMMEPort *
-JackWinMMEOutputPort::GetAlias()
+const char *
+JackWinMMEPort::GetAlias()
 {
      return alias;
 }
diff --git a/windows/winmme/JackWinMMEPort.h b/windows/winmme/JackWinMMEPort.h
index 3b53fd5f..a544c4a6 100644
--- a/windows/winmme/JackWinMMEPort.h
+++ b/windows/winmme/JackWinMMEPort.h
@@ -20,8 +20,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __JackWinMMEPort__
 #define __JackWinMMEPort__
 
-#include <mmsystem.h>
 #include <windows.h>
+#include <mmsystem.h>
+
+#include "JackConstants.h"
 
 namespace Jack {
 
@@ -34,8 +36,7 @@ namespace Jack {
 
     public:
 
-        JackWinMMEPort(const char *alias_name, const char *client_name,
-                             const char *driver_name);
+        JackWinMMEPort();
 
         ~JackWinMMEPort();
 
@@ -49,7 +50,7 @@ namespace Jack {
         GetOSErrorString(LPTSTR text);
 
         void
-        GetInErrorString(MMRESULT error, LPTSTR text);
+        WriteOSError(const char *jack_func, const char *os_func);
 
     };