From b7354b396c15d977950b535357afdc919bfcdc47 Mon Sep 17 00:00:00 2001
From: Stephane Letz <letz@grame.fr>
Date: Mon, 13 Apr 2015 11:13:31 +0200
Subject: [PATCH] Compiles again on Windows.

---
 windows/JackMMCSS.cpp                      |   2 +-
 windows/Setup/src/32bits/JackRouter.dll    | Bin 30208 -> 30208 bytes
 windows/Setup/src/64bits/JackRouter.dll    | Bin 35328 -> 35328 bytes
 windows/Setup/src/gpl_installer.rtf        | Bin 1001 -> 1001 bytes
 windows/jack_midi_dump.cbp                 |  38 ---------------------
 windows/libjacknet.cbp                     |   6 ++--
 windows/portaudio/JackPortAudioDevices.cpp |  10 +++---
 7 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/windows/JackMMCSS.cpp b/windows/JackMMCSS.cpp
index 09bfb0e3..c481a81f 100644
--- a/windows/JackMMCSS.cpp
+++ b/windows/JackMMCSS.cpp
@@ -57,7 +57,7 @@ int JackMMCSS::MMCSSAcquireRealTime(jack_native_thread_t thread, int priority)
         HANDLE task = ffMMCSSFun1("Pro Audio", &dummy);
         if (task == NULL) {
             jack_error("AvSetMmThreadCharacteristics error : %d", GetLastError());
-        } else if (ffMMCSSFun2(task, priority - BASE_REALTIME_PRIORITY)) {
+        } else if (ffMMCSSFun2(task, Jack::AVRT_PRIORITY(priority - BASE_REALTIME_PRIORITY))) {
             fHandleTable[thread] = task;
             jack_log("AvSetMmThreadPriority success");
             return 0;
diff --git a/windows/Setup/src/32bits/JackRouter.dll b/windows/Setup/src/32bits/JackRouter.dll
index af5fc4048b91b58fcb27aae4932b6ff4beb5c5b5..72b80d143d26294d24171e022b74fe0501aa0b9a 100644
GIT binary patch
delta 210
zcmZp8!`SeKaf1LOOF_GK=wuN_A7*tA#?8r$0n&_&o43d;G4d5;U}#VQVtpW<2*hqc
z+y}&wK+FNeVnD12#A!er0mM2$>;c4nKpX(XoIo51#8N;UzImzteO@XXc`>$_4eb2Q
I9w|En0Ug#beE<Le

delta 210
zcmZp8!`SeKaf1LOOV@tsz{w(vKFl-LGHgy}43K7I*t|t%iIFci14Dx}5UT)j0}xvQ
zaV-%00x=U1^8>LI5Jv&A4-hK@u?-MA0kI1ZGXt?J5DNpb_vWSk_j##o<i*%xHn8(I
Jd!+0T1OQN&Fev~4

diff --git a/windows/Setup/src/64bits/JackRouter.dll b/windows/Setup/src/64bits/JackRouter.dll
index f82dda31eef555e45021dc7fe297311d4c132779..2840cc957dc645bb0154108beaa84340cf58d598 100644
GIT binary patch
delta 644
zcmZpe!qhN@X@dYGi)FiZ=wuN_A0}4j%}I=E(u@t0J7r?(U5yWT^!lhMIQ9lGzWArY
zz~IrnM<s&^NOv|*U<6XF2TCJ6x>?(8f$U!12oTlT%m<R`X03wo#2~y92u}{e%Y*RL
zfV^(jOdzMTSr5qmFFMzPfx-B|%k>N(BeGAtXaQT=4YI7Wc?FPsk%JIP<9~m^rTd0Q
zuju-J|Nr}RAO7UYuXXqnzhLtQkV+ebN}!TG@4!l4D4>WggNm|DJ}c|T%dZNww(&>+
z(1+27H*3k|nbivdT>=CRKwV&3A4*Sz(r!??4@yTuX$~kY2Bj6DbQ+Y7fYLfp+5<}a
zLFoVpE!7YR6_A3`oKQM^vtekx)F5`>WW!MT%^3wYY%CVQ)U|m<Sq?idmnH*4M-c-9
Mh}PPySa+Wr01qgKCjbBd

delta 644
zcmZpe!qhN@X@dYG%kurwfs;iTeVBMfHzzTwNi)_>?v#nC_vrOeQE)XrV0`HXgDL}q
zNB16;3??Am**t*}NVOg)jqvDZ?X(55dwHWkRA)0ENT!>$2Er4A@X8=OIS8)+!cznC
zx>>V<oX%!FAp5`Qd<zB!;{z|(Gk}aZ@glQL1;pqES=QOS0!Y5dLx`mDzdzv8eZ!+y
zbmPDO|9!d-fAZwlI{b-Wuz3SWr5!>gP|3b`U?ne<P()WiMcF2wm-XWp1bMOXNC41>
z(TC5R*{mg(XI9S*bPEtPNJD9$eh_GA08<PNR#3VYO8Y`-pdld8zz?ORpmY?J_JPvM
zP}&AcJ3(m|2rbp%3KbBB(#%lWd$VC^z0@Ff-(<s3`OO&xHf-S3wRuHZ4m&T0CIdr9
P5d#B=*4V6Acb^*o2QP<R

diff --git a/windows/Setup/src/gpl_installer.rtf b/windows/Setup/src/gpl_installer.rtf
index fac711f5b791f8179e8bb515a43b451bd3809618..37c2dec1bb70abbde22a3a2b6288ce610e1ed30d 100644
GIT binary patch
delta 18
acmaFK{*rw{Ka-)s#EA)vCL2F}X9566?+3O3

delta 18
acmaFK{*rw{Ka+vw#EA)vh8sV9X9567F9*8-

diff --git a/windows/jack_midi_dump.cbp b/windows/jack_midi_dump.cbp
index 3e3da48b..ac5332ab 100644
--- a/windows/jack_midi_dump.cbp
+++ b/windows/jack_midi_dump.cbp
@@ -6,24 +6,6 @@
 		<Option pch_mode="2" />
 		<Option compiler="mingw_64" />
 		<Build>
-			<Target title="Win32 Release 64bits">
-				<Option output="Release64\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release64\" />
-				<Option type="1" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-					<Add directory="..\example-clients" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add library="libjack64" />
-					<Add directory="Release64\bin" />
-				</Linker>
-			</Target>
 			<Target title="Win32 Debug 64bits">
 				<Option output="Debug64\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
@@ -59,26 +41,6 @@
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
-			<Target title="Win32 Release 32bits">
-				<Option output="Release\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Release\" />
-				<Option type="1" />
-				<Option compiler="mingw_64" />
-				<Compiler>
-					<Add option="-O2" />
-					<Add option="-Wall" />
-					<Add option="-m32" />
-					<Add directory="..\example-clients" />
-					<Add directory="..\windows" />
-					<Add directory="..\common\jack" />
-					<Add directory="..\common" />
-				</Compiler>
-				<Linker>
-					<Add option="-m32" />
-					<Add library="libjack" />
-					<Add directory="Release\bin" />
-				</Linker>
-			</Target>
 			<Target title="Win32 Debug 32bits">
 				<Option output="Debug\bin\jack_midi_dump" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\" />
diff --git a/windows/libjacknet.cbp b/windows/libjacknet.cbp
index f77a3b42..a988450e 100644
--- a/windows/libjacknet.cbp
+++ b/windows/libjacknet.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\libjacknet64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\libjacknet" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -36,7 +36,7 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\libjacknet64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\libjacknet" />
 				<Option type="3" />
 				<Option compiler="gcc" />
@@ -65,7 +65,7 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release64\bin\libjacknet" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\libjacknet64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\libjacknet" />
 				<Option type="3" />
 				<Option compiler="gcc" />
diff --git a/windows/portaudio/JackPortAudioDevices.cpp b/windows/portaudio/JackPortAudioDevices.cpp
index 686202ef..362461bd 100644
--- a/windows/portaudio/JackPortAudioDevices.cpp
+++ b/windows/portaudio/JackPortAudioDevices.cpp
@@ -224,10 +224,10 @@ int PortAudioDevices::GetPreferredBufferSize(PaDeviceIndex id)
         } else {
             jack_info("ASIO buffer granularity     = %ld", granularity);
         }
-        
+
         return preferredLatency;
-    } else 
-#endif   
+    } else
+#endif
     {
         return 512; // Non ASIO driver, returns generic value
     }
@@ -260,7 +260,7 @@ void PortAudioDevices::DisplayDevicesNames()
         jack_info("Name                        = %s", GetFullName(id).c_str());
         jack_info("Max inputs                  = %d", fDeviceInfo[id]->maxInputChannels);
         jack_info("Max outputs                 = %d", fDeviceInfo[id]->maxOutputChannels);
-        
+
     #if defined(WIN32) && defined(HAVE_ASIO)
         /* ASIO specific latency information */
         if (Pa_GetHostApiInfo(fDeviceInfo[id]->hostApi)->type == paASIO) {
@@ -278,7 +278,7 @@ void PortAudioDevices::DisplayDevicesNames()
                 jack_info("ASIO buffer granularity     = %ld", granularity);
             }
         }
-    #endif 
+    #endif
         jack_info("Default sample rate         = %8.2f", fDeviceInfo[id]->defaultSampleRate);
 
         /* poll for standard sample rates */