37 files changed, 31 insertions, 3732 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index 2c95c350..fad70a7f 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,11 @@
 ChangeLog
 #########
 
+* 1.9.16 (2020-10-16)
+
+  * Fix/revert a change in how meta-data definitions were exposed (regression in 1.9.15)
+  * Remove jack-router Windows code from the repository
+
 * 1.9.15 (2020-10-15)
 
   * Automated builds for macOS and Windows (see jackaudio/jack2-releases repository)
diff --git a/common/JackConstants.h b/common/JackConstants.h
index 9f81bd5c..1075a0f6 100644
--- a/common/JackConstants.h
+++ b/common/JackConstants.h
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#define VERSION "1.9.15"
+#define VERSION "1.9.16"
 
 #define BUFFER_SIZE_MAX 8192
 
diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp
index bbabbac1..c13640a9 100644
--- a/common/JackControlAPI.cpp
+++ b/common/JackControlAPI.cpp
@@ -1283,7 +1283,7 @@ SERVER_EXPORT union jackctl_parameter_value jackctl_parameter_get_value(jackctl_
 SERVER_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
 {
     if (!parameter_ptr) {
-        return NULL;
+        return false;
     }
 
     if (!parameter_ptr->is_set)
@@ -1301,7 +1301,7 @@ SERVER_EXPORT bool jackctl_parameter_reset(jackctl_parameter *parameter_ptr)
 SERVER_EXPORT bool jackctl_parameter_set_value(jackctl_parameter *parameter_ptr, const union jackctl_parameter_value * value_ptr)
 {
     if (!parameter_ptr || !value_ptr) {
-        return NULL;
+        return false;
     }
 
     parameter_ptr->is_set = true;
diff --git a/common/JackEngine.cpp b/common/JackEngine.cpp
index 7de36261..6bbccb81 100644
--- a/common/JackEngine.cpp
+++ b/common/JackEngine.cpp
@@ -34,8 +34,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackChannel.h"
 #include "JackError.h"
 
-extern const char JACK_METADATA_HARDWARE[];
-extern const char JACK_METADATA_PRETTY_NAME[];
+extern const char* JACK_METADATA_HARDWARE;
+extern const char* JACK_METADATA_PRETTY_NAME;
 
 namespace Jack
 {
diff --git a/common/JackMetadata.cpp b/common/JackMetadata.cpp
index 783ee1a2..67704c35 100644
--- a/common/JackMetadata.cpp
+++ b/common/JackMetadata.cpp
@@ -28,16 +28,16 @@
 
 
 #define JACK_METADATA_PREFIX "http://jackaudio.org/metadata/"
-LIB_EXPORT extern const char JACK_METADATA_CONNECTED[]   = JACK_METADATA_PREFIX "connected";
-LIB_EXPORT extern const char JACK_METADATA_EVENT_TYPES[] = JACK_METADATA_PREFIX "event-types";
-LIB_EXPORT extern const char JACK_METADATA_HARDWARE[]    = JACK_METADATA_PREFIX "hardware";
-LIB_EXPORT extern const char JACK_METADATA_ICON_LARGE[]  = JACK_METADATA_PREFIX "icon-large";
-LIB_EXPORT extern const char JACK_METADATA_ICON_NAME[]   = JACK_METADATA_PREFIX "icon-name";
-LIB_EXPORT extern const char JACK_METADATA_ICON_SMALL[]  = JACK_METADATA_PREFIX "icon-small";
-LIB_EXPORT extern const char JACK_METADATA_ORDER[]       = JACK_METADATA_PREFIX "order";
-LIB_EXPORT extern const char JACK_METADATA_PORT_GROUP[]  = JACK_METADATA_PREFIX "port-group";
-LIB_EXPORT extern const char JACK_METADATA_PRETTY_NAME[] = JACK_METADATA_PREFIX "pretty-name";
-LIB_EXPORT extern const char JACK_METADATA_SIGNAL_TYPE[] = JACK_METADATA_PREFIX "signal-type";
+LIB_EXPORT const char* JACK_METADATA_CONNECTED   = JACK_METADATA_PREFIX "connected";
+LIB_EXPORT const char* JACK_METADATA_EVENT_TYPES = JACK_METADATA_PREFIX "event-types";
+LIB_EXPORT const char* JACK_METADATA_HARDWARE    = JACK_METADATA_PREFIX "hardware";
+LIB_EXPORT const char* JACK_METADATA_ICON_LARGE  = JACK_METADATA_PREFIX "icon-large";
+LIB_EXPORT const char* JACK_METADATA_ICON_NAME   = JACK_METADATA_PREFIX "icon-name";
+LIB_EXPORT const char* JACK_METADATA_ICON_SMALL  = JACK_METADATA_PREFIX "icon-small";
+LIB_EXPORT const char* JACK_METADATA_ORDER       = JACK_METADATA_PREFIX "order";
+LIB_EXPORT const char* JACK_METADATA_PORT_GROUP  = JACK_METADATA_PREFIX "port-group";
+LIB_EXPORT const char* JACK_METADATA_PRETTY_NAME = JACK_METADATA_PREFIX "pretty-name";
+LIB_EXPORT const char* JACK_METADATA_SIGNAL_TYPE = JACK_METADATA_PREFIX "signal-type";
 #undef JACK_METADATA_PREFIX
 
 namespace Jack
diff --git a/common/jack/metadata.h b/common/jack/metadata.h
index 7f18c38e..891dbd62 100644
--- a/common/jack/metadata.h
+++ b/common/jack/metadata.h
@@ -229,7 +229,7 @@ int jack_set_property_change_callback (jack_client_t*             client,
  * A value that identifies what the hardware port is connected to (an external
  * device of some kind). Possible values might be "E-Piano" or "Master 2 Track".
  */
-extern const char JACK_METADATA_CONNECTED[];
+extern const char* JACK_METADATA_CONNECTED;
 
 /**
  * The supported event types of an event port.
@@ -242,21 +242,21 @@ extern const char JACK_METADATA_CONNECTED[];
  * status byte will gracefully ignore OSC messages if the user makes an
  * inappropriate connection.
  */
-extern const char JACK_METADATA_EVENT_TYPES[];
+extern const char* JACK_METADATA_EVENT_TYPES;
 
 /**
  * A value that should be shown when attempting to identify the
  * specific hardware outputs of a client. Typical values might be
  * "ADAT1", "S/PDIF L" or "MADI 43".
  */
-extern const char JACK_METADATA_HARDWARE[];
+extern const char* JACK_METADATA_HARDWARE;
 
 /**
  * A value with a MIME type of "image/png;base64" that is an encoding of an
  * NxN (with 32 < N <= 128) image to be used when displaying a visual
  * representation of that client or port.
  */
-extern const char JACK_METADATA_ICON_LARGE[];
+extern const char* JACK_METADATA_ICON_LARGE;
 
 /**
  * The name of the icon for the subject (typically client).
@@ -267,14 +267,14 @@ extern const char JACK_METADATA_ICON_LARGE[];
  * Theme Specification:
  * https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
  */
-extern const char JACK_METADATA_ICON_NAME[];
+extern const char* JACK_METADATA_ICON_NAME;
 
 /**
  * A value with a MIME type of "image/png;base64" that is an encoding of an
  * NxN (with N <=32) image to be used when displaying a visual representation
  * of that client or port.
  */
-extern const char JACK_METADATA_ICON_SMALL[];
+extern const char* JACK_METADATA_ICON_SMALL;
 
 /**
  * Order for a port.
@@ -287,18 +287,18 @@ extern const char JACK_METADATA_ICON_SMALL[];
  *
  * It is encouraged to use http://www.w3.org/2001/XMLSchema#int as the type.
  */
-extern const char JACK_METADATA_ORDER[];
+extern const char* JACK_METADATA_ORDER;
 
 /**
  * A value that should be shown to the user when displaying a port to the user,
  * unless the user has explicitly overridden that a request to show the port
  * name, or some other key value.
  */
-extern const char JACK_METADATA_PRETTY_NAME[];
+extern const char* JACK_METADATA_PRETTY_NAME;
 
 /**
  */
-extern const char JACK_METADATA_PORT_GROUP[];
+extern const char* JACK_METADATA_PORT_GROUP;
 
 /**
  * The type of an audio signal.
@@ -309,7 +309,7 @@ extern const char JACK_METADATA_PORT_GROUP[];
  * their output directly to speakers.  In particular, CV ports are not
  * necessarily periodic at all and may have very high DC.
  */
-extern const char JACK_METADATA_SIGNAL_TYPE[];
+extern const char* JACK_METADATA_SIGNAL_TYPE;
 
 /**
  * @}
diff --git a/windows/JackRouter/JackRouter.cpp b/windows/JackRouter/JackRouter.cpp
deleted file mode 100644
index 0ee0f748..00000000
--- a/windows/JackRouter/JackRouter.cpp
+++ /dev/null
@@ -1,1002 +0,0 @@
-/*
- Copyright (C) 2006-2011 Grame
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-#ifdef WIN32
-#pragma warning (disable : 4786)
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <process.h>
-#include "JackRouter.h"
-#include "profport.h"
-
-/*
-	08/07/2007 SL : Use jack_client_open instead of jack_client_new (automatic client renaming).
-	09/08/2007 SL : Add JackRouter.ini parameter file.
-	09/20/2007 SL : Better error report in DllRegisterServer (for Vista).
-	09/27/2007 SL : Add AUDO_CONNECT property in JackRouter.ini file.
-	10/10/2007 SL : Use ASIOSTInt32LSB instead of ASIOSTInt16LSB.
-	12/04/2011 SL : Compilation on Windows 64.
-	12/04/2011 SL : Dynamic port allocation. Correct JACK port naming.
- */
-
-//------------------------------------------------------------------------------------------
-// extern
-void getNanoSeconds(ASIOTimeStamp *time);
-
-// local
-double AsioSamples2double (ASIOSamples* samples);
-
-static const double twoRaisedTo32 = 4294967296.;
-static const double twoRaisedTo32Reciprocal = 1. / twoRaisedTo32;
-
-//------------------------------------------------------------------------------------------
-// on windows, we do the COM stuff.
-
-#if WINDOWS
-#include "windows.h"
-#include "mmsystem.h"
-#ifdef _WIN64
-#define JACK_ROUTER "JackRouter.dll"
-#include <psapi.h>
-#else
-#define JACK_ROUTER "JackRouter.dll"
-#include "./psapi.h"
-#endif
-
-using namespace std;
-
-//#define JACK_LOG 1
-
-#ifdef JACK_LOG
-#include <fstream>
-static std::ofstream* fStream;
-#endif
-
-// class id.
-// {838FE50A-C1AB-4b77-B9B6-0A40788B53F3}
-CLSID IID_ASIO_DRIVER = { 0x838fe50a, 0xc1ab, 0x4b77, { 0xb9, 0xb6, 0xa, 0x40, 0x78, 0x8b, 0x53, 0xf3 } };
-
-
-CFactoryTemplate g_Templates[1] = {
-    {L"ASIOJACK", &IID_ASIO_DRIVER, JackRouter::CreateInstance}
-};
-int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]);
-
-CUnknown* JackRouter::CreateInstance(LPUNKNOWN pUnk, HRESULT *phr)
-{
-	return (CUnknown*)new JackRouter(pUnk,phr);
-};
-
-STDMETHODIMP JackRouter::NonDelegatingQueryInterface(REFIID riid, void ** ppv)
-{
-	if (riid == IID_ASIO_DRIVER) {
-		return GetInterface(this, ppv);
-	}
-	return CUnknown::NonDelegatingQueryInterface(riid, ppv);
-}
-
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//		Register ASIO Driver
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-extern LONG RegisterAsioDriver(CLSID,char *,char *,char *,char *);
-extern LONG UnregisterAsioDriver(CLSID,char *,char *);
-
-//
-// Server registration, called on REGSVR32.EXE "the dllname.dll"
-//
-HRESULT _stdcall DllRegisterServer()
-{
-	LONG	rc;
-	char	errstr[128];
-
-	rc = RegisterAsioDriver (IID_ASIO_DRIVER, JACK_ROUTER,"JackRouter","JackRouter","Apartment");
-
-	if (rc) {
-		memset(errstr,0,128);
-		sprintf(errstr,"Register Server failed ! (%d)", rc);
-		MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"JackRouter",MB_OK);
-		return -1;
-	}
-
-	return S_OK;
-}
-
-//
-// Server unregistration
-//
-HRESULT _stdcall DllUnregisterServer()
-{
-	LONG	rc;
-	char	errstr[128];
-
-	rc = UnregisterAsioDriver (IID_ASIO_DRIVER,JACK_ROUTER,"JackRouter");
-
-	if (rc) {
-		memset(errstr,0,128);
-		sprintf(errstr,"Unregister Server failed ! (%d)",rc);
-		MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"JackRouter",MB_OK);
-		return -1;
-	}
-
-	return S_OK;
-}
-
-// Globals
-list<pair<string, string> > JackRouter::fConnections;
-
-//------------------------------------------------------------------------------------------
-//------------------------------------------------------------------------------------------
-JackRouter::JackRouter (LPUNKNOWN pUnk, HRESULT *phr)
-	: CUnknown("ASIOJACK", pUnk, phr)
-
-//------------------------------------------------------------------------------------------
-
-#else
-
-// when not on windows, we derive from AsioDriver
-JackRouter::JackRouter() : AsioDriver()
-
-#endif
-{
-	long i;
-	fSamplePosition = 0;
-	fRunning = false;
-	fTimeInfoMode = false;
-	fTcRead = false;
-	fClient = NULL;
-	fAutoConnectIn = true;
-	fAutoConnectOut = true;
-	fCallbacks = 0;
-	fActiveInputs = fActiveOutputs = 0;
-	fToggle = 0;
-	fBufferSize = 512;
-	fSampleRate = 44100;
-    fFloatSample = true;    // float by default
-	fFirstActivate = true;
-
-#ifdef JACK_LOG 
-	fStream = new ofstream(name_log, ios_base::ate);
-    *fStream << "======================" << std::endl;
-    *fStream << "JackRouter::JackRouter" <<  std::endl;
-    *fStream << "======================" << std::endl;
-#endif
-
-	// Use "jackrouter.ini" parameters if available
-	HMODULE handle = LoadLibrary(JACK_ROUTER);
-
-	if (handle) {
-
-		// Get JackRouter.dll path
-		char dllName[512];
-		string confPath;
-		DWORD res = GetModuleFileName(handle, dllName, 512);
-
-		// Compute .ini file path
-		string fullPath = dllName;
-		int lastPos = fullPath.find_last_of(PATH_SEP);
-		string  dllFolder =  fullPath.substr(0, lastPos);
-		confPath = dllFolder + PATH_SEP + "JackRouter.ini";
-
-		// Get parameters
-		kNumInputs = get_private_profile_int("IO", "input", 2, confPath.c_str());
-		kNumOutputs = get_private_profile_int("IO", "output", 2, confPath.c_str());
-
-		fAutoConnectIn = get_private_profile_int("AUTO_CONNECT", "input", 1, confPath.c_str());
-		fAutoConnectOut = get_private_profile_int("AUTO_CONNECT", "output", 1, confPath.c_str());
-        
-        fFloatSample = get_private_profile_int("IO", "float-sample", 0, confPath.c_str());
-        fAliasSystem = get_private_profile_int("AUTO_CONNECT", "alias", 0, confPath.c_str());
-
-		FreeLibrary(handle);
- 
-	} else {
-    #ifdef JACK_LOG 
-        *fStream << "JackRouter::JackRouter : loadLibrary error" <<  std::endl;
-    #endif
-	}
-    
-    if (!fFloatSample) {
-        fInputBuffers = (void**)new long*[kNumInputs];
-        fOutputBuffers = (void**)new long*[kNumOutputs];
-    } else {
-        fInputBuffers = (void**)new float*[kNumInputs];
-        fOutputBuffers = (void**)new float*[kNumOutputs];
-    }
-
-    fInMap = new long[kNumInputs];
-	fOutMap = new long[kNumOutputs];
-    
-    fInputPorts = new jack_port_t*[kNumInputs];
-    fOutputPorts = new jack_port_t*[kNumOutputs];
- 
-	for (i = 0; i < kNumInputs; i++) {
-		fInputBuffers[i] = 0;
-		fInputPorts[i] = 0;
-		fInMap[i] = 0;
-	}
-	for (i = 0; i < kNumOutputs; i++) {
-		fOutputBuffers[i] = 0;
-		fOutputPorts[i] = 0;
-		fOutMap[i] = 0;
-	}
-}
-
-//------------------------------------------------------------------------------------------
-JackRouter::~JackRouter()
-{
-#ifdef JACK_LOG 
-    *fStream << "=======================" << std::endl;
-    *fStream << "JackRouter::~JackRouter" <<  std::endl;
-    *fStream << "=======================" << std::endl;
-#endif
-	stop();
-	disposeBuffers();
-	jack_client_close(fClient);
-	delete[] fInputBuffers;
-    delete[] fOutputBuffers;
-    delete[] fInputPorts;
-    delete[] fOutputPorts;
-    delete[] fInMap;
-    delete[] fOutMap;
-#ifdef JACK_LOG  
-    delete fStream;
-#endif
-}
-
-//------------------------------------------------------------------------------------------
-
-static bool GetEXEName(DWORD dwProcessID, char* name)
-{
-    DWORD aProcesses [1024], cbNeeded, cProcesses;
-    unsigned int i;
-
-    // Enumerate all processes
-    if (!EnumProcesses(aProcesses, sizeof(aProcesses), &cbNeeded))
-        return false;
-
-    // Calculate how many process identifiers were returned.
-    cProcesses = cbNeeded / sizeof(DWORD);
-
-    TCHAR szEXEName[MAX_PATH];
-    // Loop through all process to find the one that matches
-    // the one we are looking for
-
-    for (i = 0; i < cProcesses; i++) {
-        if (aProcesses [i] == dwProcessID) {
-            // Get a handle to the process
-            HANDLE hProcess = OpenProcess(PROCESS_QUERY_INFORMATION |
-                              PROCESS_VM_READ, FALSE, dwProcessID);
-
-            // Get the process name
-            if (NULL != hProcess) {
-                HMODULE hMod;
-                DWORD cbNeeded;
-
-                if (EnumProcessModules(hProcess, &hMod,
-                                      sizeof(hMod), &cbNeeded)) {
-                    //Get the name of the exe file
-                    GetModuleBaseName(hProcess, hMod, szEXEName,
-                        sizeof(szEXEName)/sizeof(TCHAR));
-					int len = strlen((char*)szEXEName) - 4; // remove ".exe"
-					strncpy(name, (char*)szEXEName, len);
-					name[len] = '\0';
-					return true;
-                 }
-            }
-        }
-    }
-
-    return false;
-}
-
- //------------------------------------------------------------------------------------------
-static inline jack_default_audio_sample_t ClipFloat(jack_default_audio_sample_t sample)
-{
-     return (sample < jack_default_audio_sample_t(-1.0)) ? jack_default_audio_sample_t(-1.0) : (sample > jack_default_audio_sample_t(1.0)) ? jack_default_audio_sample_t(1.0) : sample;
-}
-
-//------------------------------------------------------------------------------------------
-void JackRouter::connectCallback(jack_port_id_t a, jack_port_id_t b, int connect, void* arg)
-{
-    JackRouter* driver = (JackRouter*)arg;
-}
-
-//------------------------------------------------------------------------------------------
-void JackRouter::shutdownCallback(void* arg)
-{
-	JackRouter* driver = (JackRouter*)arg;
-	/*
-	char errstr[128];
-	memset(errstr,0,128);
-	sprintf(errstr,"JACK server has quit");
-	MessageBox(0,(LPCTSTR)errstr,(LPCTSTR)"JackRouter",MB_OK);
-	*/
-}
-
-//------------------------------------------------------------------------------------------
-void JackRouter::processInputs()
-{
-    int pos = (fToggle) ? 0 : fBufferSize;
-    
-    for (int i = 0; i < fActiveInputs; i++) {
-        if (!fFloatSample) {
-            jack_default_audio_sample_t* buffer = (jack_default_audio_sample_t*)jack_port_get_buffer(fInputPorts[i], fBufferSize);
-            long* in = (long*)fInputBuffers[i] + pos;
-            for (int j = 0; j < fBufferSize; j++) {
-                in[j] = buffer[j] * jack_default_audio_sample_t(0x7fffffff);
-            }
-        } else {
-            memcpy((float*)fInputBuffers[i] + pos,
-                    jack_port_get_buffer(fInputPorts[i], fBufferSize),
-                    fBufferSize * sizeof(jack_default_audio_sample_t));
-        }
-    }
-}
-
-//------------------------------------------------------------------------------------------
-void JackRouter::processOutputs()
-{
-    int pos = (fToggle) ? 0 : fBufferSize;
-    
-    for (int i = 0; i < fActiveOutputs; i++) {
-        if (!fFloatSample) {
-            jack_default_audio_sample_t* buffer = (jack_default_audio_sample_t*)jack_port_get_buffer(fOutputPorts[i], fBufferSize);
-            long* out = (long*)fOutputBuffers[i] + pos;
-            jack_default_audio_sample_t gain = jack_default_audio_sample_t(1)/jack_default_audio_sample_t(0x7fffffff);
-            for (int j = 0; j < fBufferSize; j++) {
-                buffer[j] = out[j] * gain;
-            }
-        } else {
-            memcpy(jack_port_get_buffer(fOutputPorts[i], fBufferSize),
-                    (float*)fOutputBuffers[i] + pos,
-                    fBufferSize * sizeof(jack_default_audio_sample_t));
-        }
-    }
-}
-
-//------------------------------------------------------------------------------------------
-int JackRouter::processCallback(jack_nframes_t nframes, void* arg)
-{
-	JackRouter* driver = (JackRouter*)arg;
-  	driver->bufferSwitch();
-	return 0;
-}
-
-//------------------------------------------------------------------------------------------
-void JackRouter::getDriverName(char *name)
-{
-	strcpy(name, "JackRouter");
-}
-
-//------------------------------------------------------------------------------------------
-long JackRouter::getDriverVersion()
-{
-	return 0x00000001L;
-}
-
-//------------------------------------------------------------------------------------------
-void JackRouter::getErrorMessage(char *string)
-{
-	strcpy (string, fErrorMessage);
-}
-
-//------------------------------------------------------------------------------------------
-ASIOBool JackRouter::init(void* sysRef)
-{
-	char name[MAX_PATH];
-	char name_log[MAX_PATH];
-	sysRef = sysRef;
-
-	if (fClient) {
-    #ifdef JACK_LOG 
-        *fStream << "JackRouter::init : JACK client still present..." <<  std::endl;
-    #endif
-		return true;
-	}
-
-	HANDLE win = (HANDLE)sysRef;
-	int	my_pid = _getpid();
-
-	if (!GetEXEName(my_pid, name)) { // If getting the .exe name fails, takes a generic one.
-		_snprintf(name, sizeof(name) - 1, "JackRouter_%d", my_pid);
-	}
-
-	_snprintf(name_log, sizeof(name_log) - 1, "JackRouter_%s.log", name);
-
-	fClient = jack_client_open(name, JackNoStartServer, NULL);
-	if (fClient == NULL) {
-		strcpy(fErrorMessage, "Open error: is JACK server running?");
-		printf("Open error: is JACK server running?\n");
-		return false;
-	}
-
-	fBufferSize = jack_get_buffer_size(fClient);
-	fSampleRate = jack_get_sample_rate(fClient);
-    
-	jack_set_process_callback(fClient, processCallback, this);
-	jack_on_shutdown(fClient, shutdownCallback, this);
-    jack_set_port_connect_callback(fClient, connectCallback, this);
-
-	fInputLatency = fBufferSize;		// typically
-	fOutputLatency = fBufferSize * 2;
-	fMilliSeconds = (long)((double)(fBufferSize * 1000) / fSampleRate);
-
-	// Typically fBufferSize * 2; try to get 1 by offering direct buffer
-	// access, and using asioPostOutput for lower latency
-
-#ifdef JACK_LOG 
-    *fStream << "JackRouter::init" <<  std::endl;
-#endif
-	return true;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::start()
-{
-	if (fCallbacks) {
-		fSamplePosition = 0;
-		fTheSystemTime.lo = fTheSystemTime.hi = 0;
-		fToggle = 0;
-		
-    #ifdef JACK_LOG 
-        *fStream << "JackRouter::start" <<  std::endl;
-    #endif
-
-		if (jack_activate(fClient) == 0) {
-
-			if (fFirstActivate) {
-				autoConnect();
-				fFirstActivate = false;
-			} else {
-				restoreConnections();
-			}
-
-			fRunning = true;
-			return ASE_OK;
-
-		} else {
-			return ASE_NotPresent;
-		}
-	}
-
-	return ASE_NotPresent;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::stop()
-{
-#ifdef JACK_LOG 
-    *fStream << "JackRouter::stop" <<  std::endl;
-#endif
-	fRunning = false;
-	saveConnections();
-	if (jack_deactivate(fClient) == 0) {
-		fFirstActivate = true;
-	}
-	return ASE_OK;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::getChannels(long *numInputChannels, long *numOutputChannels)
-{
-	*numInputChannels = kNumInputs;
-	*numOutputChannels = kNumOutputs;
-	return ASE_OK;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::getLatencies(long *_inputLatency, long *_outputLatency)
-{
-	*_inputLatency = fInputLatency;
-	*_outputLatency = fOutputLatency;
-	return ASE_OK;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::getBufferSize(long *minSize, long *maxSize, long *preferredSize, long *granularity)
-{
-	*minSize = *maxSize = *preferredSize = fBufferSize;		// Allows this size only
-	*granularity = 0;
-	return ASE_OK;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::canSampleRate(ASIOSampleRate sampleRate)
-{
-	return (sampleRate == fSampleRate) ? ASE_OK : ASE_NoClock;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::getSampleRate(ASIOSampleRate *sampleRate)
-{
-	*sampleRate = fSampleRate;
-	return ASE_OK;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::setSampleRate(ASIOSampleRate sampleRate)
-{
-	return (sampleRate == fSampleRate) ? ASE_OK : ASE_NoClock;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::getClockSources(ASIOClockSource *clocks, long *numSources)
-{
-	// Internal
-	if (clocks && numSources) {
-		clocks->index = 0;
-		clocks->associatedChannel = -1;
-		clocks->associatedGroup = -1;
-		clocks->isCurrentSource = ASIOTrue;
-		strcpy(clocks->name, "Internal");
-		*numSources = 1;
-		return ASE_OK;
-	} else {
-		return ASE_InvalidParameter;
-	}
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::setClockSource(long index)
-{
-	if (!index) {
-		fAsioTime.timeInfo.flags |= kClockSourceChanged;
-		return ASE_OK;
-	} else {
-		return ASE_NotPresent;
-	}
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp)
-{
-	tStamp->lo = fTheSystemTime.lo;
-	tStamp->hi = fTheSystemTime.hi;
-
-	if (fSamplePosition >= twoRaisedTo32) {
-		sPos->hi = (unsigned long)(fSamplePosition * twoRaisedTo32Reciprocal);
-		sPos->lo = (unsigned long)(fSamplePosition - (sPos->hi * twoRaisedTo32));
-	} else {
-		sPos->hi = 0;
-		sPos->lo = (unsigned long)fSamplePosition;
-	}
-	return ASE_OK;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::getChannelInfo(ASIOChannelInfo *info)
-{
-	if (info->channel < 0 || (info->isInput ? info->channel >= kNumInputs : info->channel >= kNumOutputs)) {
-		return ASE_InvalidParameter;
-    }
-    
-    if (!fFloatSample) {
-        info->type = ASIOSTInt32LSB;
-    } else {
-        info->type = ASIOSTFloat32LSB;
-    }
-
-#ifdef JACK_LOG    
-	*fStream << "==========================" << std::endl;
-    *fStream << "JackRouter::getChannelInfo" << std::endl;
-	*fStream << "==========================" << std::endl;
-#endif
-
-	info->channelGroup = 0;
-	info->isActive = ASIOFalse;
-	long i;
-	char buf[32];
-    const char** ports;
-
-	char* aliases[2];
-	aliases[0] = (char*)malloc(jack_port_name_size());
-	aliases[1] = (char*)malloc(jack_port_name_size());
-
-	if (!aliases[0] || !aliases[1]) {
-		return ASE_NoMemory;
-    }
-
-	if (info->isInput) {
-		for (i = 0; i < fActiveInputs; i++) {
-			if (fInMap[i] == info->channel) {
-				info->isActive = ASIOTrue;
-				break;
-			}
-		}
-		
-        // A alias on system is wanted
-        if (fAliasSystem && fAutoConnectIn && (ports = jack_get_ports(fClient, NULL, NULL, JackPortIsPhysical | JackPortIsOutput))) {
-            jack_port_t* port = jack_port_by_name(fClient, ports[info->channel]);
-            if (port) {	
-                if (jack_port_get_aliases(port, aliases) == 2) {
-                    strncpy(info->name, aliases[1], 32);
-                #ifdef JACK_LOG
-                    *fStream << "Input " << "fActiveInputs = " << i << " ASIO_channel = " << info->channel <<  std::endl;
-                #endif
-                    goto end;
-                }	
-            }
-        } 
-            
-        _snprintf(buf, sizeof(buf) - 1, "In%d", info->channel + 1);
-        strcpy(info->name, buf);
-         
-	} else {
-		for (i = 0; i < fActiveOutputs; i++) {
-			if (fOutMap[i] == info->channel) {  
-				info->isActive = ASIOTrue;
-				break;
-			}
-		}
-        
-        // A alias on system is wanted
-        if (fAliasSystem && fAutoConnectOut && (ports = jack_get_ports(fClient, NULL, NULL, JackPortIsPhysical | JackPortIsInput))) {
-            jack_port_t* port = jack_port_by_name(fClient, ports[info->channel]);
-            if (port) {	
-                if (jack_port_get_aliases(port, aliases) == 2) {
-                    strncpy(info->name, aliases[1], 32);
-                #ifdef JACK_LOG
-                    *fStream << "Output " << "fActiveOutputs = " << i << " ASIO_channel = " << info->channel <<  std::endl;
-                #endif    
-                    goto end;
-                }	
-            }
-        } 
-        _snprintf(buf, sizeof(buf) - 1, "Out%d", info->channel + 1);
-        strcpy(info->name, buf);
-    }
-    
-end:
-
-	free(aliases[0]);
-	free(aliases[1]);
-	return ASE_OK;
-}
-
-//------------------------------------------------------------------------------------------
-ASIOError JackRouter::createBuffers(ASIOBufferInfo *bufferInfos, long numChannels,
-	long bufferSize, ASIOCallbacks *callbacks)
-{
-	ASIOBufferInfo *info = bufferInfos;
-	long i;
-	bool notEnoughMem = false;
-	char buf[256];
-	fActiveInputs = 0;
-	fActiveOutputs = 0;
-
-#ifdef JACK_LOG    
-	*fStream << "==========================" << std::endl;
-    *fStream << "JackRouter::createBuffers" << std::endl;
-	*fStream << "==========================" << std::endl;
-#endif
-
-	for (i = 0; i < numChannels; i++, info++) {
-		if (info->isInput) {
-            
-			if (info->channelNum < 0 || info->channelNum >= kNumInputs) {
-				goto error;
-            }
-			fInMap[fActiveInputs] = info->channelNum;
-            
-            if (!fFloatSample) {
-                fInputBuffers[fActiveInputs] = new long[fBufferSize * 2];	// double buffer
-            } else {
-                fInputBuffers[fActiveInputs] = new jack_default_audio_sample_t[fBufferSize * 2];	// double buffer
-            }
-            
-			if (fInputBuffers[fActiveInputs]) {
-				info->buffers[0] = fInputBuffers[fActiveInputs];
-				info->buffers[1] = (fFloatSample) ? (void*)((float*)fInputBuffers[fActiveInputs] + fBufferSize) : (void*)((long*)fInputBuffers[fActiveInputs] + fBufferSize);
-			} else {
-				info->buffers[0] = info->buffers[1] = 0;
-				notEnoughMem = true;
-			}
-        #ifdef JACK_LOG
-            *fStream << "Input " << "fActiveInputs = " << i << " ASIO_channel = " << info->channelNum <<  std::endl;
-        #endif
-			_snprintf(buf, sizeof(buf) - 1, "in%d", info->channelNum + 1);
-			fInputPorts[fActiveInputs]
-				= jack_port_register(fClient, buf, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput,0);
-			if (fInputPorts[fActiveInputs] == NULL) {
-				goto error;
-            }
-
-			fActiveInputs++;
-			if (fActiveInputs > kNumInputs) {
-error:
-				disposeBuffers();
-				return ASE_InvalidParameter;
-			}
-		} else {	
-        
-     		if (info->channelNum < 0 || info->channelNum >= kNumOutputs) {
-				goto error;
-            }
-			fOutMap[fActiveOutputs] = info->channelNum;
-
-            if (!fFloatSample) {
-                fOutputBuffers[fActiveOutputs] = new long[fBufferSize * 2];	// double buffer
-            } else {
-                fOutputBuffers[fActiveOutputs] = new jack_default_audio_sample_t[fBufferSize * 2];	// double buffer
-            }
-
-			if (fOutputBuffers[fActiveOutputs]) {
-				info->buffers[0] = fOutputBuffers[fActiveOutputs];
-				info->buffers[1] = (fFloatSample) ? (void*)((float*)fOutputBuffers[fActiveOutputs] + fBufferSize) : (void*)((long*)fOutputBuffers[fActiveOutputs] + fBufferSize);
-			} else {
-				info->buffers[0] = info->buffers[1] = 0;
-				notEnoughMem = true;
-			}
-        #ifdef JACK_LOG
-            *fStream << "Input " << "fActiveOutputs = " << i << " ASIO_channel = " << info->channelNum <<  std::endl;
-		#endif	
-			_snprintf(buf, sizeof(buf) - 1, "out%d", info->channelNum + 1);
-			fOutputPorts[fActiveOutputs]
-				= jack_port_register(fClient, buf, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput,0);
-			if (fOutputPorts[fActiveOutputs] == NULL) {
-				goto error;
-            }
-
-			fActiveOutputs++;
-			if (fActiveOutputs > kNumOutputs) {
-				fActiveOutputs--;
-				disposeBuffers();
-				return ASE_InvalidParameter;
-			}
-		}
-	}
-
-	if (notEnoughMem) {
-		disposeBuffers();
-		return ASE_NoMemory;
-	}
-
-	this->fCallbacks = callbacks;
-	if (callbacks->asioMessage (kAsioSupportsTimeInfo, 0, 0, 0)) {
-		fTimeInfoMode = true;
-		fAsioTime.timeInfo.speed = 1.;
-		fAsioTime.timeInfo.systemTime.hi = fAsioTime.timeInfo.systemTime.lo = 0;
-		fAsioTime.timeInfo.samplePosition.hi = fAsioTime.timeInfo.samplePosition.lo = 0;
-		fAsioTime.timeInfo.sampleRate = fSampleRate;
-		fAsioTime.timeInfo.flags = kSystemTimeValid | kSamplePositionValid | kSampleRateValid;
-		fAsioTime.timeCode.speed = 1.;
-		fAsioTime.timeCode.timeCodeSamples.lo = fAsioTime.timeCode.timeCodeSamples.hi = 0;
-		fAsioTime.timeCode.flags = kTcValid | kTcRunning ;
-	} else {
-		fTimeInfoMode = false;
-	}
-
-	if (fRunning) { 
-		autoConnect();
-	}
-	return ASE_OK;
-}
-
-//---------------------------------------------------------------------------------------------
-ASIOError JackRouter::disposeBuffers()
-{
-	long i;
-
-	fCallbacks = 0;
-	stop();
-
-	for (i = 0; i < fActiveInputs; i++) {
-		delete[] fInputBuffers[i];
-		jack_port_unregister(fClient, fInputPorts[i]);
-	}
-	fActiveInputs = 0;
-
-	for (i = 0; i < fActiveOutputs; i++) {
-		delete[] fOutputBuffers[i];
-		jack_port_unregister(fClient, fOutputPorts[i]);
-	}
-	fActiveOutputs = 0;
-
-	return ASE_OK;
-}
-
-//---------------------------------------------------------------------------------------------
-ASIOError JackRouter::controlPanel()
-{
-	return ASE_NotPresent;
-}
-
-//---------------------------------------------------------------------------------------------
-ASIOError JackRouter::future(long selector, void* opt)	// !!! check properties
-{
-	ASIOTransportParameters* tp = (ASIOTransportParameters*)opt;
-    
-	switch (selector) {
-		case kAsioEnableTimeCodeRead:	fTcRead = true;	return ASE_SUCCESS;
-		case kAsioDisableTimeCodeRead:	fTcRead = false; return ASE_SUCCESS;
-		case kAsioSetInputMonitor:		return ASE_SUCCESS;	// for testing!!!
-		case kAsioCanInputMonitor:		return ASE_SUCCESS;	// for testing!!!
-		case kAsioCanTimeInfo:			return ASE_SUCCESS;
-		case kAsioCanTimeCode:			return ASE_SUCCESS;
-	}
-    
-	return ASE_NotPresent;
-}
-
-//--------------------------------------------------------------------------------------------------------
-// private methods
-//--------------------------------------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------------------------
-void JackRouter::bufferSwitch()
-{
-	if (fRunning && fCallbacks) {
-		getNanoSeconds(&fTheSystemTime);			// latch system time
-        processInputs();
-        processOutputs();
-		fSamplePosition += fBufferSize;
-		if (fTimeInfoMode) {
-			bufferSwitchX();
-		} else {
-			fCallbacks->bufferSwitch(fToggle, ASIOFalse);
-		}
-		fToggle = fToggle ? 0 : 1;
-	}
-}
-
-//---------------------------------------------------------------------------------------------
-// asio2 buffer switch
-void JackRouter::bufferSwitchX()
-{
-	getSamplePosition (&fAsioTime.timeInfo.samplePosition, &fAsioTime.timeInfo.systemTime);
-	long offset = fToggle ? fBufferSize : 0;
-	if (fTcRead) {
-		// Create a fake time code, which is 10 minutes ahead of the card's sample position
-		// Please note that for simplicity here time code will wrap after 32 bit are reached
-		fAsioTime.timeCode.timeCodeSamples.lo = fAsioTime.timeInfo.samplePosition.lo + 600.0 * fSampleRate;
-		fAsioTime.timeCode.timeCodeSamples.hi = 0;
-	}
-	fCallbacks->bufferSwitchTimeInfo(&fAsioTime, fToggle, ASIOFalse);
-	fAsioTime.timeInfo.flags &= ~(kSampleRateChanged | kClockSourceChanged);
-}
-
-//---------------------------------------------------------------------------------------------
-ASIOError JackRouter::outputReady()
-{
-	return ASE_NotPresent;
-}
-
-//---------------------------------------------------------------------------------------------
-double AsioSamples2double(ASIOSamples* samples)
-{
-	double a = (double)(samples->lo);
-	if (samples->hi) {
-		a += (double)(samples->hi) * twoRaisedTo32;
-    }
-	return a;
-}
-
-//---------------------------------------------------------------------------------------------
-void getNanoSeconds(ASIOTimeStamp* ts)
-{
-	double nanoSeconds = (double)((unsigned long)timeGetTime ()) * 1000000.;
-	ts->hi = (unsigned long)(nanoSeconds / twoRaisedTo32);
-	ts->lo = (unsigned long)(nanoSeconds - (ts->hi * twoRaisedTo32));
-}
-
-//------------------------------------------------------------------------
-void JackRouter::saveConnections()
-{
-    const char** connections;
- 	int i;
-
-    for (i = 0; i < fActiveInputs; ++i) {
-        if (fInputPorts[i] && (connections = jack_port_get_connections(fInputPorts[i])) != 0) {
-            for (int j = 0; connections[j]; j++) {
-                fConnections.push_back(make_pair(connections[j], jack_port_name(fInputPorts[i])));
-            }
-            jack_free(connections);
-        }
-    }
-
-    for (i = 0; i < fActiveOutputs; ++i) {
-        if (fOutputPorts[i] && (connections = jack_port_get_connections(fOutputPorts[i])) != 0) {
-            for (int j = 0; connections[j]; j++) {
-                fConnections.push_back(make_pair(jack_port_name(fOutputPorts[i]), connections[j]));
-            }
-            jack_free(connections);
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-void JackRouter::restoreConnections()
-{
-    list<pair<string, string> >::const_iterator it;
-
-    for (it = fConnections.begin(); it != fConnections.end(); it++) {
-        pair<string, string> connection = *it;
-        jack_connect(fClient, connection.first.c_str(), connection.second.c_str());
-    }
-
-    fConnections.clear();
-}
-
-
-//------------------------------------------------------------------------------------------
-void JackRouter::autoConnect()
-{
-	const char** ports;
-
-#ifdef JACK_LOG    
-	*fStream << "=======================" << std::endl;
-    *fStream << "JackRouter::autoConnect" << std::endl;
-	*fStream << "=======================" << std::endl;
-#endif
-
-	if ((ports = jack_get_ports(fClient, NULL, NULL, JackPortIsPhysical | JackPortIsOutput)) == NULL) {
-    #ifdef JACK_LOG 
-        *fStream << "JackRouter::autoConnect : cannot find any physical capture ports" << std::endl;
-    #endif
-	} else {
-		if (fAutoConnectIn) {
-        	for (int i = 0; i < fActiveInputs; i++) {
-                long ASIO_channel = fInMap[i];
-                if (!ports[ASIO_channel]) {
-					printf("source port is null ASIO_channel = %ld\n", ASIO_channel);
-					break;
-				} else if (jack_connect(fClient, ports[ASIO_channel], jack_port_name(fInputPorts[i])) != 0) {
-					printf("Cannot connect input ports\n");
-				} else {
-                #ifdef JACK_LOG
-                    *fStream << "Input " << "fActiveInputs = " << i << " ASIO_channel = " << ASIO_channel <<  std::endl;
-                #endif
-                }
-			}
-		}
-		jack_free(ports);
-	}
-
-	if ((ports = jack_get_ports(fClient, NULL, NULL, JackPortIsPhysical | JackPortIsInput)) == NULL) {
-    #ifdef JACK_LOG 
-        *fStream << "JackRouter::autoConnect : cannot find any physical playback ports" << std::endl;
-    #endif
-	} else {
-		if (fAutoConnectOut) {
-			for (int i = 0; i < fActiveOutputs; i++) {
-                long ASIO_channel = fOutMap[i];
-				if (!ports[ASIO_channel]) {
-					printf("destination port is null ASIO_channel = %ld\n", ASIO_channel);
-					break;
-				} else if (jack_connect(fClient, jack_port_name(fOutputPorts[i]), ports[ASIO_channel]) != 0) {
-					printf("Cannot connect output ports\n");
-				} else {
-                #ifdef JACK_LOG
-                    *fStream << "Output " << "fActiveOutputs = " << i << " ASIO_channel = " << ASIO_channel <<  std::endl;
-                #endif
-                }
-			}
-		}
-		jack_free(ports);
-	}
-}
-
diff --git a/windows/JackRouter/JackRouter.def b/windows/JackRouter/JackRouter.def
deleted file mode 100644
index 1316d71f..00000000
--- a/windows/JackRouter/JackRouter.def
+++ /dev/null
@@ -1,9 +0,0 @@
-LIBRARY			JackRouter
-DESCRIPTION		'ASIO Jack Driver'
-PROTMODE
-EXPORTS	
-				DllMain
-				DllGetClassObject
-				DllCanUnloadNow
-				DllRegisterServer
-				DllUnregisterServer
diff --git a/windows/JackRouter/JackRouter.dsp b/windows/JackRouter/JackRouter.dsp
deleted file mode 100644
index f059568e..00000000
--- a/windows/JackRouter/JackRouter.dsp
+++ /dev/null
@@ -1,163 +0,0 @@
-# Microsoft Developer Studio Project File - Name="JackRouter" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=JackRouter - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "JackRouter.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "JackRouter.mak" CFG="JackRouter - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "JackRouter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "JackRouter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "JackRouter - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\ASIOSDK2\common" /I "..\..\common" /I "..\..\common\jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "JackRouter - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\ASIOSDK2\common" /I "..\..\common" /I "..\..\common\jack" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Debug/JackRouter_debug.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "JackRouter - Win32 Release"
-# Name "JackRouter - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\..\..\..\ASIOSDK2\common\combase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\ASIOSDK2\common\dllentry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackRouter.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackRouter.def
-# End Source File
-# Begin Source File
-
-SOURCE=.\profport.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\ASIOSDK2\common\register.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\..\common\asio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Common\Asiodrvr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\asiosmpl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\asiosys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\combase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\common\iasiodrv.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=.\Psapi.Lib
-# End Source File
-# Begin Source File
-
-SOURCE=..\Release\bin\libjack.lib
-# End Source File
-# End Target
-# End Project
diff --git a/windows/JackRouter/JackRouter.dsw b/windows/JackRouter/JackRouter.dsw
deleted file mode 100644
index e26ab1ee..00000000
--- a/windows/JackRouter/JackRouter.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "JackRouter"=".\JackRouter.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/windows/JackRouter/JackRouter.h b/windows/JackRouter/JackRouter.h
deleted file mode 100644
index c48d8d69..00000000
--- a/windows/JackRouter/JackRouter.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- Copyright (C) 2006-2011 Grame
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
- ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-#ifndef _asiosmpl_
-#define _asiosmpl_
-
-#include "asiosys.h"
-
-// Globals
-static int	kBlockFrames = 256;
-static int	kNumInputs = 4;
-static int	kNumOutputs = 4;
-
-#if WINDOWS
-
-#include "jack.h"
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef COM_NO_WINDOWS_H
-#ifdef __MINGW32__
-#include <winsock2.h>
-#endif
-#include <windows.h>
-#include "ole2.h"
-#endif
-
-#include "combase.h"
-#include "iasiodrv.h"
-
-#define PATH_SEP "\\"
-
-#include <list>
-#include <string>
-
-class JackRouter : public IASIO, public CUnknown
-{
-public:
-	JackRouter(LPUNKNOWN pUnk, HRESULT *phr);
-	~JackRouter();
-
-	DECLARE_IUNKNOWN
-    //STDMETHODIMP QueryInterface(REFIID riid, void **ppv) {      \
-    //    return GetOwner()->QueryInterface(riid,ppv);            \
-    //};                                                          \
-    //STDMETHODIMP_(ULONG) AddRef() {                             \
-    //    return GetOwner()->AddRef();                            \
-    //};                                                          \
-    //STDMETHODIMP_(ULONG) Release() {                            \
-    //    return GetOwner()->Release();                           \
-    //};
-
-	// Factory method
-	static CUnknown *CreateInstance(LPUNKNOWN pUnk, HRESULT *phr);
-	// IUnknown
-	virtual HRESULT STDMETHODCALLTYPE NonDelegatingQueryInterface(REFIID riid,void **ppvObject);
-#else
-
-#include "asiodrvr.h"
-
-//---------------------------------------------------------------------------------------------
-class JackRouter : public AsioDriver
-{
-public:
-	JackRouter();
-	~JackRouter();
-#endif
-
-	static int processCallback(jack_nframes_t nframes, void* arg);
-    static void connectCallback(jack_port_id_t a, jack_port_id_t b, int connect, void* arg);
-	static void shutdownCallback(void* arg);
-
-	ASIOBool init(void* sysRef);
-	void getDriverName(char *name);		// max 32 bytes incl. terminating zero
-	long getDriverVersion();
-	void getErrorMessage(char *string);	// max 128 bytes incl.
-
-	ASIOError start();
-	ASIOError stop();
-
-	ASIOError getChannels(long *numInputChannels, long *numOutputChannels);
-	ASIOError getLatencies(long *inputLatency, long *outputLatency);
-	ASIOError getBufferSize(long *minSize, long *maxSize,
-		long *preferredSize, long *granularity);
-
-	ASIOError canSampleRate(ASIOSampleRate sampleRate);
-	ASIOError getSampleRate(ASIOSampleRate *sampleRate);
-	ASIOError setSampleRate(ASIOSampleRate sampleRate);
-	ASIOError getClockSources(ASIOClockSource *clocks, long *numSources);
-	ASIOError setClockSource(long index);
-
-	ASIOError getSamplePosition(ASIOSamples *sPos, ASIOTimeStamp *tStamp);
-	ASIOError getChannelInfo(ASIOChannelInfo *info);
-
-	ASIOError createBuffers(ASIOBufferInfo *bufferInfos, long numChannels,
-		long bufferSize, ASIOCallbacks *callbacks);
-	ASIOError disposeBuffers();
-
-	ASIOError controlPanel();
-	ASIOError future(long selector, void *opt);
-	ASIOError outputReady();
-
-	void bufferSwitch();
-	long getMilliSeconds() {return fMilliSeconds;}
-
-	static std::list<std::pair<std::string, std::string> > fConnections;  // Connections list
-
-private:
-
-	void bufferSwitchX();
-
-	double fSamplePosition;
-	ASIOCallbacks* fCallbacks;
-	ASIOTime fAsioTime;
-	ASIOTimeStamp fTheSystemTime;
-
-	void** fInputBuffers;
-	void** fOutputBuffers;
-
-	long* fInMap;
-	long* fOutMap;
-
-	long fInputLatency;
-	long fOutputLatency;
-	long fActiveInputs;
-	long fActiveOutputs;
-	long fToggle;
-	long fMilliSeconds;
-	bool fRunning;
-	bool fFirstActivate;
-    bool fFloatSample;
-    bool fAliasSystem;
-	bool fTimeInfoMode, fTcRead;
-	char fErrorMessage[128];
-
-	bool fAutoConnectIn;
-	bool fAutoConnectOut;
-
-	// Jack part
-	jack_client_t* fClient;
-	jack_port_t** fInputPorts;
-	jack_port_t** fOutputPorts;
-	long fBufferSize;
-	ASIOSampleRate fSampleRate;
-
-	void autoConnect();
-	void saveConnections();
-    void restoreConnections();
-    
-    void processInputs();
-    void processOutputs();
-
-};
-
-#endif
-
diff --git a/windows/JackRouter/JackRouter.vcxproj b/windows/JackRouter/JackRouter.vcxproj
deleted file mode 100644
index d894f4ae..00000000
--- a/windows/JackRouter/JackRouter.vcxproj
+++ /dev/null
@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <SccProjectName />
-    <SccLocalPath />
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\Debug\</OutDir>
-    <IntDir>.\Debug\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>.\Debug\</OutDir>
-    <IntDir>.\Debug\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\Release\</OutDir>
-    <IntDir>.\Release\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\Release64\</OutDir>
-    <IntDir>.\Release64\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <MinimalRebuild>true</MinimalRebuild>
-      <AdditionalIncludeDirectories>..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Debug\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Debug\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Debug\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug\JackRouter.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>Debug/JackRouter_debug.dll</OutputFile>
-      <ImportLibrary>.\Debug\JackRouter_debug.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Debug\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Debug\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Debug\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug\JackRouter.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>Debug/JackRouter_debug.dll</OutputFile>
-      <ImportLibrary>.\Debug\JackRouter_debug.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Release\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Release\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Release\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release\JackRouter.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>.\Release\JackRouter.dll</OutputFile>
-      <ImportLibrary>.\Release\JackRouter.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>..\..\..\..\..\ASIOSDK2\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;PSAPI_VERSION=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Release\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Release\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Release\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release\JackRouter64.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>.\Release64\JackRouter.dll</OutputFile>
-      <ImportLibrary>.\Release\JackRouter64.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\..\ASIOSDK2\common\combase.cpp" />
-    <ClCompile Include="..\..\..\..\..\ASIOSDK2\common\dllentry.cpp" />
-    <ClCompile Include="JackRouter.cpp" />
-    <ClCompile Include="profport.cpp" />
-    <ClCompile Include="..\..\..\..\..\ASIOSDK2\common\register.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="JackRouter.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\common\asio.h" />
-    <ClInclude Include="..\..\Common\Asiodrvr.h" />
-    <ClInclude Include="..\asiosmpl.h" />
-    <ClInclude Include="..\..\..\common\asiosys.h" />
-    <ClInclude Include="..\..\..\common\combase.h" />
-    <ClInclude Include="..\..\..\common\iasiodrv.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\Release64\bin\libjack64.lib" />
-    <Library Include="..\Release\bin\libjack.lib" />
-    <Library Include="Psapi.Lib" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/windows/JackRouter/JackRouter.vcxproj.filters b/windows/JackRouter/JackRouter.vcxproj.filters
deleted file mode 100644
index 899efbc8..00000000
--- a/windows/JackRouter/JackRouter.vcxproj.filters
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{72f2b2b0-dbea-4574-94fa-0c1ea89a3c8e}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{9590ca0b-94c8-4c22-88b2-66724eb0ea21}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{9742e150-2741-4bf4-9b81-bea4aab464af}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\..\ASIOSDK2\common\combase.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\ASIOSDK2\common\dllentry.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="JackRouter.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="profport.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\ASIOSDK2\common\register.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\common\asio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Common\Asiodrvr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\asiosmpl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\common\asiosys.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\common\combase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\common\iasiodrv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\Release\bin\libjack.lib" />
-    <Library Include="..\Release64\bin\libjack64.lib" />
-    <Library Include="Psapi.Lib" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="JackRouter.def">
-      <Filter>Source Files</Filter>
-    </CustomBuild>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/windows/JackRouter/JackRouter.vcxproj.user b/windows/JackRouter/JackRouter.vcxproj.user
deleted file mode 100644
index f5e1823b..00000000
--- a/windows/JackRouter/JackRouter.vcxproj.user
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ShowAllFiles>false</ShowAllFiles>
-  </PropertyGroup>
-</Project>
-\ No newline at end of file
diff --git a/windows/JackRouter/JackRouter_MinGW_deps.sln b/windows/JackRouter/JackRouter_MinGW_deps.sln
deleted file mode 100644
index 6bfc2b0d..00000000
--- a/windows/JackRouter/JackRouter_MinGW_deps.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2018
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JackRouter_MinGW_deps", "JackRouter_MinGW_deps.vcxproj", "{08E8BE85-76F9-4070-B85E-0CA6A38BCBB4}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{08E8BE85-76F9-4070-B85E-0CA6A38BCBB4}.Debug|x64.ActiveCfg = Debug|x64
-		{08E8BE85-76F9-4070-B85E-0CA6A38BCBB4}.Debug|x64.Build.0 = Debug|x64
-		{08E8BE85-76F9-4070-B85E-0CA6A38BCBB4}.Release|x64.ActiveCfg = Release|x64
-		{08E8BE85-76F9-4070-B85E-0CA6A38BCBB4}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {14794710-1A0E-40AE-99C4-98C59280F0C3}
-	EndGlobalSection
-EndGlobal
diff --git a/windows/JackRouter/JackRouter_MinGW_deps.vcxproj b/windows/JackRouter/JackRouter_MinGW_deps.vcxproj
deleted file mode 100644
index d654f590..00000000
--- a/windows/JackRouter/JackRouter_MinGW_deps.vcxproj
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <SccProjectName />
-    <SccLocalPath />
-    <ProjectGuid>{08E8BE85-76F9-4070-B85E-0CA6A38BCBB4}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\Debug\</OutDir>
-    <IntDir>.\Debug\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>.\Debug\</OutDir>
-    <IntDir>.\Debug\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\Release\</OutDir>
-    <IntDir>.\Release\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>.\Release64\</OutDir>
-    <IntDir>.\Release64\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <MinimalRebuild>true</MinimalRebuild>
-      <AdditionalIncludeDirectories>c:\msys64\opt\asiosdk\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_STDINT_H;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Debug\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Debug\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Debug\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug\JackRouter.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>Debug/JackRouter_debug.dll</OutputFile>
-      <ImportLibrary>.\Debug\JackRouter_debug.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>c:\msys64\opt\asiosdk\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_STDINT_H;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Debug\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Debug\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Debug\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug\JackRouter.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>Debug/JackRouter_debug.dll</OutputFile>
-      <ImportLibrary>.\Debug\JackRouter_debug.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>c:\msys64\opt\asiosdk\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_STDINT_H;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Release\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Release\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Release\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release\JackRouter.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>.\Release\JackRouter.dll</OutputFile>
-      <ImportLibrary>.\Release\JackRouter.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <WarningLevel>Level3</WarningLevel>
-      <AdditionalIncludeDirectories>c:\msys64\opt\asiosdk\common;..\..\common;..\..\common\jack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_STDINT_H;WIN32;NDEBUG;_WINDOWS;PSAPI_VERSION=2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <PrecompiledHeaderOutputFile>.\Release\JackRouter.pch</PrecompiledHeaderOutputFile>
-      <ObjectFileName>.\Release\</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
-      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
-      <ForcedIncludeFiles>stdint.h</ForcedIncludeFiles>
-    </ClCompile>
-    <Midl>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <TypeLibraryName>.\Release\JackRouter.tlb</TypeLibraryName>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-    </Midl>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release\JackRouter64.bsc</OutputFile>
-    </Bscmake>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <LinkDLL>true</LinkDLL>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>.\Release64\JackRouter.dll</OutputFile>
-      <ImportLibrary>.\Release\JackRouter64.lib</ImportLibrary>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\JackRouter.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="c:\msys64\opt\asiosdk\common\combase.cpp" />
-    <ClCompile Include="c:\msys64\opt\asiosdk\common\dllentry.cpp" />
-    <ClCompile Include="JackRouter.cpp" />
-    <ClCompile Include="profport.cpp" />
-    <ClCompile Include="c:\msys64\opt\asiosdk\common\register.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="JackRouter.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\common\asio.h" />
-    <ClInclude Include="..\..\Common\Asiodrvr.h" />
-    <ClInclude Include="..\asiosmpl.h" />
-    <ClInclude Include="..\..\..\common\asiosys.h" />
-    <ClInclude Include="..\..\..\common\combase.h" />
-    <ClInclude Include="..\..\..\common\iasiodrv.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="c:\msys64\opt\jack\bin\jack.dll.a" />
-    <Library Include="Psapi.Lib" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/windows/JackRouter/Psapi.Lib b/windows/JackRouter/Psapi.Lib
deleted file mode 100644
index ae896911..00000000
--- a/windows/JackRouter/Psapi.Lib
+++ /dev/null
diff --git a/windows/JackRouter/README b/windows/JackRouter/README
deleted file mode 100644
index 0f59b441..00000000
--- a/windows/JackRouter/README
+++ /dev/null
@@ -1,7 +0,0 @@
-This folder contains the sources for ASIO/JACK bridge ASIO driver called "JackRouter". The included project is a Microsoft VC++ 6 one. 
-It requires some files (combase.cpp, dllentry.cpp, register.cpp) that are part on the ASIO driver SDK. The produced "JackRouter.dll" file
-has to be registered in the system using the "regsvr32" tool.
-
-64 bits compilation
-====================
-A Visual Studio 10 project has been added to compile 64 and 32 bits targets.
-\ No newline at end of file
diff --git a/windows/JackRouter/profport.cpp b/windows/JackRouter/profport.cpp
deleted file mode 100644
index ffc68b28..00000000
--- a/windows/JackRouter/profport.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-History : 
-01-28-02 : Change the location of temporary files created in write_private_profile_string
-		   now done in TmpDirectory.
-01-29-02 : Correct bug when the '=' character is not present.
-06-18-02 : Return default value if file does not exist, new write_private_profile_int function.
-*/
-
-/***** Routines to read profile strings --  by Joseph J. Graf ******/
-/***** corrections and improvements -- by D. Fober - Grame ******/
-/*
-	corrections: buffer sizes control
-	improvements: behavior more similar to windows
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include <string>
-
-#include <ctype.h> 
-#include "profport.h"   /* function prototypes in here */
-
-#ifndef _WIN32
-
-static int read_line (FILE *fp, char *bp, int size);
-static int read_section(FILE *fp, char *section);
-static int read_entry (FILE *fp, char *entry, char *buff, int size);
-static char * read_value (char *buff);
-static int read_int_value (char *buff, int def);
-static char * read_file (char *file);
-static char * str_search (char * buff, char * str, int stopCond);
-
-/*****************************************************************
-* Function:     read_line()
-* Arguments:    <FILE *> fp - a pointer to the file to be read from
-*               <char *> bp - a pointer to the copy buffer
-*               <int>  size - size of the copy buffer
-* Returns:      the line length if successful -1 otherwise
-******************************************************************/
-static int read_line(FILE *fp, char *bp, int size)
-{  
-	char c = '\0';
-	int i = 0, limit = size-2;
-
-	/* Read one line from the source file */
-	while (((c = getc(fp)) != '\n') && (i < limit)) {
-		if (c == EOF) {
-			if (!i) return -1;
-			else break;
-		}
-		bp[i++] = c;
-	}
-	bp[i] = '\0';
-	return i;
-}
-
-static int read_section (FILE *fp, char *section)
-{  
-	char buff[MAX_LINE_LENGTH];
-	char t_section[MAX_LINE_LENGTH];
-	int n, slen;
-
-	sprintf(t_section,"[%s]", section); /* Format the section name */
-	slen = strlen (t_section);
-	/*  Move through file 1 line at a time until a section is matched or EOF */
-	do {
-		n = read_line(fp, buff, MAX_LINE_LENGTH); 
-		if (n == -1)   
-			return 0;
-	} while (strncmp (buff,t_section, slen));
-	return 1;
- }
-
-static int read_entry (FILE *fp, char *entry, char *buff, int size)
-{  
-	int n, elen = strlen (entry);
-
-	do {
-		n = read_line(fp, buff, size); 
-		if (n == -1) 
-			return 0;
-		else if (*buff == '[')
-			return 0;	
-	} while (strncmp (buff, entry, elen));
-	return 1;
- }
-
-#define isBlank(c)	((c == ' ') || (c == '\t'))
-static char * read_value (char *buff)
-{  
-    char * eq = strrchr (buff,'=');    /* Parse out the equal sign */
-    if (eq) {
-    	eq++;
-    	while (*eq && isBlank(*eq))
-    		eq++;
-//    	return *eq ? eq : 0;
-    	return eq;
-    }
-    return eq;
- }
-
-#define isSignedDigit(c)	(isdigit(c) || (c == '+') || (c == '-'))
-static int read_int_value (char *buff, int def)
-{  
-    char * val = read_value (buff);
-    char value[20]; int i;
-    
-    if (!*val) return def;
-    
-	for (i = 0; isSignedDigit(*val) && (i <= 10); i++ )
-		value[i] = *val++;
-	value[i] = '\0';
-    return value[0] ? atoi(value) : def;
-}
- 
-static char * read_file (char *file)
-{
-	FILE *fd = fopen (file,"r");
-	int size; char * buff = 0;
-	
-	if (!fd) return 0;
-	if (fseek (fd, 0, SEEK_END) == -1) goto err;
-	size = ftell (fd);
-	if (size < 0) goto err;
-	if (fseek (fd, 0, SEEK_SET) == -1) goto err;
-	buff = (char *) malloc (size+1);
-	if (buff) {
-		*buff = 0;
-		fread (buff, 1, size, fd);
-		buff[size] = 0;
-	}
-err:
-	fclose (fd);
-	return buff;
-}
- 
-static char * str_search (char * buff, char * str, int stopCond)
-{
-	char *ptr = buff;
-	int len = strlen (str);
-	while (*ptr && strncmp (ptr, str, len)) {
-		while (*ptr && (*ptr++ != '\n')) 
-			;
-		if (*ptr == stopCond)
-			return 0;
-	}
-	return *ptr ? ptr : 0;
-}
-
-/**************************************************************************
-* Function:     get_private_profile_int()
-* Arguments:    <char *> section - the name of the section to search for
-*               <char *> entry - the name of the entry to find the value of
-*               <int> def - the default value in the event of a failed read
-*               <char *> file_name - the name of the .ini file to read from
-* Returns:      the value located at entry
-***************************************************************************/
-int get_private_profile_int(char *section,
-    char *entry, int def, char *file_name)
-{   
-    FILE *fp = fopen(file_name,"r");
-    char buff[MAX_LINE_LENGTH];
-    
-    if( !fp ) return def; /* Return default value if file does not exist */
-    if (!read_section (fp, section)) goto err;
-    if (!read_entry (fp, entry, buff, MAX_LINE_LENGTH)) goto err;
-	def = read_int_value (buff, def);
-err:
-	fclose (fp);
-	return def;
-}
-
-/**************************************************************************
-* Function:     get_private_profile_string()
-* Arguments:    <char *> section - the name of the section to search for
-*               <char *> entry - the name of the entry to find the value of
-*               <char *> def - default string in the event of a failed read
-*               <char *> buffer - a pointer to the buffer to copy into
-*               <int> buffer_len - the max number of characters to copy
-*               <char *> file_name - the name of the .ini file to read from
-* Returns:      the number of characters copied into the supplied buffer
-***************************************************************************/
-
-int get_private_profile_string(char *section, char *entry, char *def,
-    char *buffer, int buffer_len, char *file_name)
-{   
-    FILE *fp = fopen (file_name,"r");
-    char buff[MAX_LINE_LENGTH];
-    char *val;
-    
-    if( !fp ) goto err; /* Return default value if file does not exist */
-    if (!read_section (fp, section)) goto err;
-    if (!read_entry (fp, entry, buff, MAX_LINE_LENGTH)) goto err;
-	val = read_value (buff);
-    if(val) def = val;
-
-err:
-	if (fp) fclose (fp);
-	if (def) {
-		strncpy (buffer, def, buffer_len - 1);
-		buffer[buffer_len] = '\0';
-	}
-	else buffer[buffer_len] = '\0';
-	return strlen (buffer);
-}
-
-
-/***************************************************************************
- * Function:    write_private_profile_string()
- * Arguments:   <char *> section - the name of the section to search for
- *              <char *> entry - the name of the entry to find the value of
- *              <char *> buffer - pointer to the buffer that holds the string
- *              <char *> file_name - the name of the .ini file to read from
- * Returns:     TRUE if successful, otherwise FALSE
- ***************************************************************************/
-int write_private_profile_string(char *section,
-    char *entry, char *buffer, char *file_name)
-
-{
-	char * content = read_file(file_name);
-	FILE * fd = fopen(file_name,"w");
-    char t_section[MAX_LINE_LENGTH], *ptr;
-    int ret = 0;
-	
-	if (!fd) goto end;
-	if (!content) {
-    	fprintf (fd, "[%s]\n%s = %s\n", section, entry, buffer);
-    	ret = 1;
-    	goto end;
-	}
-    sprintf(t_section,"[%s]",section);         /* Format the section name */
-    ptr = str_search (content, t_section, 0);  /* look for the section start */
-    if (!ptr) {
-    	/* no such section: add the new section at end of file */
-    	fprintf (fd, "%s\n[%s]\n%s = %s\n", content, section, entry, buffer);
-    }
-    else {
-    	char * eptr;
-    	eptr = str_search (ptr, entry, '[');
-    	if (!eptr) {
-    		/* no such entry: looks for next section */
-    		eptr = str_search (++ptr, "[", 0);
-	    	if (!eptr) {
-    			/* section is the last one */
-	    		fprintf (fd, "%s\n%s = %s\n", content, entry, buffer);
-	    	}
-	    	else {
-	    		while (*ptr && (*ptr != '\n')) ptr++;
-	    		*ptr = 0;
-	    		fprintf (fd, "%s\n%s = %s", content, entry, buffer);
-	    		*ptr = '\n';
-	    		fprintf (fd, "%s", ptr);
-	    	}
-	    }
-	    else {
-	    	*eptr++ = 0;
-	    	fprintf (fd, "%s%s = %s", content, entry, buffer);
-	    	while (*eptr && (*eptr != '\n')) eptr++;
-	    	if (eptr) fprintf (fd, "%s", eptr);
-	    }
-    }
-    ret = 1;
-
-end:
-	if (content) free(content);
-	if (fd) fclose(fd);
-	return 0;
-}
-
-/***************************************************************************
- * Function:    write_private_profile_int()
- * Arguments:   <char *> section - the name of the section to search for
- *              <char *> entry - the name of the entry to find the value of
- *              <int> buffer - the value to be written
- *              <char *> file_name - the name of the .ini file to read from
- * Returns:     TRUE if successful, otherwise FALSE
- ***************************************************************************/
-int write_private_profile_int(char *section,
-    char *entry, int val, char *file_name)
-{
-    char buffer [64];
-    sprintf(buffer, "%d", val);
-    return write_private_profile_string (section,entry, buffer, file_name);
-}
-
-#endif // #ifndef WIN32
-
-
-/**************************************************************************
-* Function:     get_private_profile_float()
-* Arguments:    <char *> section - the name of the section to search for
-*               <char *> entry - the name of the entry to find the value of
-*               <float> def - the default value in the event of a failed read
-*               <char *> file_name - the name of the .ini file to read from
-* Returns:      the value located at entry
-* Warning:		The float value to be read must not contain more than 100 digits.
-* Author:		CD, 15/11/2006.
-***************************************************************************/
-#define maxFloatLen	100
-float get_private_profile_float	(char * section, char * entry, float def, char * file_name)
-{
-	float result = def;
-	char buffer[ maxFloatLen ], *endptr;
-
-	if ( get_private_profile_string(section, entry, "", buffer, maxFloatLen, file_name) > 0 )
-	{
-		result = (float)strtod(buffer, &endptr);
-		if ((result==0) && (endptr==buffer))
-			result = def;
-	}
-	return result;
-}
diff --git a/windows/JackRouter/profport.h b/windows/JackRouter/profport.h
deleted file mode 100644
index 2f717177..00000000
--- a/windows/JackRouter/profport.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/******************************************************************************
- PORTABLE ROUTINES FOR WRITING PRIVATE PROFILE STRINGS --  by Joseph J. Graf
- Header file containing prototypes and compile-time configuration.
- 
- [09/05/02] D. Fober - Windows definitions added
-******************************************************************************/
-
-#ifndef __profport__
-#define __profport__
-
-#define MAX_LINE_LENGTH    1024
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef WIN32
-#include "Windows.h"
-#define get_private_profile_int        GetPrivateProfileInt
-#define get_private_profile_string     GetPrivateProfileString
-#define write_private_profile_string   WritePrivateProfileString
-#define write_private_profile_int      WritePrivateProfileInt
-#else
-int get_private_profile_int      (char * section, char * entry, int def, char * file_name);
-int get_private_profile_string   (char * section, char * entry, char * def, char * buffer, int buffer_len, char * file_name);
-int write_private_profile_string (char * section, char * entry, char * buffer, char * file_name);
-int write_private_profile_int    (char * section, char * entry, int val, char * file_name);
-#endif
-
-float get_private_profile_float	(char * section, char * entry, float def, char * file_name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //__profport__
diff --git a/windows/JackRouter/psapi.dll b/windows/JackRouter/psapi.dll
deleted file mode 100644
index ff4c964c..00000000
--- a/windows/JackRouter/psapi.dll
+++ /dev/null
diff --git a/windows/JackRouter/psapi.h b/windows/JackRouter/psapi.h
deleted file mode 100644
index af72931e..00000000
--- a/windows/JackRouter/psapi.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-	psapi.h - Include file for PSAPI.DLL APIs
-
-	Written by Mumit Khan <khan@nanotech.wisc.edu>
-
-	This file is part of a free library for the Win32 API.
-
-	NOTE: This strictly does not belong in the Win32 API since it's
-	really part of Platform SDK. However,GDB needs it and we might
-	as well provide it here.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-*/
-#ifndef _PSAPI_H
-#define _PSAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef RC_INVOKED
-
-typedef struct _MODULEINFO {
-	LPVOID lpBaseOfDll;
-	DWORD SizeOfImage;
-	LPVOID EntryPoint;
-} MODULEINFO,*LPMODULEINFO;
-
-typedef struct _PSAPI_WS_WATCH_INFORMATION {
-	LPVOID FaultingPc;
-	LPVOID FaultingVa;
-} PSAPI_WS_WATCH_INFORMATION,*PPSAPI_WS_WATCH_INFORMATION;
-
-typedef struct _PROCESS_MEMORY_COUNTERS {
-	DWORD cb;
-	DWORD PageFaultCount;
-	DWORD PeakWorkingSetSize;
-	DWORD WorkingSetSize;
-	DWORD QuotaPeakPagedPoolUsage;
-	DWORD QuotaPagedPoolUsage;
-	DWORD QuotaPeakNonPagedPoolUsage;
-	DWORD QuotaNonPagedPoolUsage;
-	DWORD PagefileUsage;
-	DWORD PeakPagefileUsage;
-} PROCESS_MEMORY_COUNTERS,*PPROCESS_MEMORY_COUNTERS;
-
-/* Grouped by application,not in alphabetical order. */
-BOOL WINAPI EnumProcesses(DWORD *,DWORD,DWORD *);
-BOOL WINAPI EnumProcessModules(HANDLE,HMODULE *,DWORD,LPDWORD);
-DWORD WINAPI GetModuleBaseNameA(HANDLE,HMODULE,LPSTR,DWORD);
-DWORD WINAPI GetModuleBaseNameW(HANDLE,HMODULE,LPWSTR,DWORD);
-DWORD WINAPI GetModuleFileNameExA(HANDLE,HMODULE,LPSTR,DWORD);
-DWORD WINAPI GetModuleFileNameExW(HANDLE,HMODULE,LPWSTR,DWORD);
-BOOL WINAPI GetModuleInformation(HANDLE,HMODULE,LPMODULEINFO,DWORD);
-BOOL WINAPI EmptyWorkingSet(HANDLE);
-BOOL WINAPI QueryWorkingSet(HANDLE,PVOID,DWORD);
-BOOL WINAPI InitializeProcessForWsWatch(HANDLE);
-BOOL WINAPI GetWsChanges(HANDLE,PPSAPI_WS_WATCH_INFORMATION,DWORD);
-DWORD WINAPI GetMappedFileNameW(HANDLE,LPVOID,LPWSTR,DWORD);
-DWORD WINAPI GetMappedFileNameA(HANDLE,LPVOID,LPSTR,DWORD);
-BOOL WINAPI EnumDeviceDrivers(LPVOID *,DWORD,LPDWORD);
-DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID,LPSTR,DWORD);
-DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID,LPWSTR,DWORD);
-DWORD WINAPI GetDeviceDriverFileNameA(LPVOID,LPSTR,DWORD);
-DWORD WINAPI GetDeviceDriverFileNameW(LPVOID,LPWSTR,DWORD);
-BOOL WINAPI GetProcessMemoryInfo(HANDLE,PPROCESS_MEMORY_COUNTERS,DWORD);
-
-#endif /* not RC_INVOKED */
-
-#ifdef UNICODE
-#define GetModuleBaseName GetModuleBaseNameW
-#define GetModuleFileNameEx GetModuleFileNameExW
-#define GetMappedFilenameEx GetMappedFilenameExW
-#define GetDeviceDriverBaseName GetDeviceDriverBaseNameW
-#define GetDeviceDriverFileName GetDeviceDriverFileNameW
-#else
-#define GetModuleBaseName GetModuleBaseNameA
-#define GetModuleFileNameEx GetModuleFileNameExA
-#define GetMappedFilenameEx GetMappedFilenameExA
-#define GetDeviceDriverBaseName GetDeviceDriverBaseNameA
-#define GetDeviceDriverFileName GetDeviceDriverFileNameA
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PSAPI_H */
-
diff --git a/windows/JackRouter/resource.h b/windows/JackRouter/resource.h
deleted file mode 100644
index 673206e6..00000000
--- a/windows/JackRouter/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by resource.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/windows/JackRouter/resource.rc b/windows/JackRouter/resource.rc
deleted file mode 100644
index 23387184..00000000
--- a/windows/JackRouter/resource.rc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Fran�ais (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,2,1,0
- PRODUCTVERSION 0,2,1,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040c04b0"
-        BEGIN
-            VALUE "CompanyName", "Grame"
-            VALUE "FileDescription", "JackRouter ASIO driver"
-            VALUE "FileVersion", "0, 2, 1, 0"
-            VALUE "InternalName", "JackRouter"
-            VALUE "LegalCopyright", "Copyright Grame � 2006-2011"
-            VALUE "OriginalFilename", "JackRouter.dll"
-            VALUE "ProductName", "JackRouter"
-            VALUE "ProductVersion", "0, 2, 1, 0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x40c, 1200
-    END
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // Fran�ais (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/windows/Setup/README b/windows/Setup/README
deleted file mode 100644
index fa854b37..00000000
--- a/windows/Setup/README
+++ /dev/null
@@ -1,24 +0,0 @@
-This folder contains a script to create an installer for windows.
-It uses 'CreateInstall Free'(http://www.createinstall.com), a little software allowing to make simple installers.
-
-You can use the 'jack.ci' script to make the installer. For that, you need to build the Code::Blocks workspace in order to have '.exe' and libraries. 
-You also need 'qjackctl' binaries and libraries ('qjackctl.exe', 'mingwm10.dll', 'QtCore4.dll', 'QtGui.dll' and 'QtXml4.dll'). 
-You can recompile qjackctl with qt4 or directly get the binaries. The five files are expected in the 'qjackctl' folder.
-
-You also need the Microsoft Visual C++ 2008 Redistributable Package (x86) (the vcrdist_x86.exe file) to be in src folder.
-
-If you need libjack.lib and libjackserver.lib to link with in MS Visual Studio, you can use the MS Tool lib.exe to create the .lib file from de .def.
-Just use : 'lib /DEF:libjackserver.def /OUT:libjackserver.lib' and 'lib /DEF:libjack.def /OUT:libjack.lib' to create the lib file.
-Or you can also use dlltool, from mingw suite :
-Just use : 'dlltool -l libjackserver.lib -D libjackserver.dll -d libjackserver.def' and 'dlltool -l libjack.lib -D libjack.dll -d libjack.def'
-
-Once all binaries are available, just execute the script in 'CreateInstall' to make 'setup.exe'.
-The setup will copy all binaries to a specified folder, register the JackRouter (in order to have it in the ASIO drivers list) and create some shortcuts in the start menu.
-It's a good and proper way to get jack installed on windows.
-
-64 bits compilation
-====================
-
-- for some reasons CodeBlocks create libjack.dll.a and libjack.dll.def names. So the ".dll" part has to be removed before using "lib" tool to create ".lib" files.
-
-- to create 64 bits ".lib" files, the "/MACHINE:X64 option has to be used.
diff --git a/windows/Setup/jack.ci b/windows/Setup/jack.ci
deleted file mode 100644
index 4d2ab43c..00000000
--- a/windows/Setup/jack.ci
+++ /dev/null
@@ -1,144 +0,0 @@
-<*project
-      version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" > 
-   <output> .</>
-   <exename> Jack_v1.9.12_32_setup.exe</>
-   <digitsign> </>
-   <appname> Jack</>
-   <password> </>
-   <addlang> </>
-   <icon> Default - 2</>
-   <selfextr> 1</>
-   <voltype> nolimit</>
-   <volsize> </>
-   <volpattern> disk%i.pak</>
-   <load> </>
-   <loadtime> 1000</>
-   <checktype> admin</>
-   <chkname> </>
-   <chkmsg> </>
-   <dlgfont> Verdana,8</>
-   <lang> English</>
-   <theme> Green</>
-   <iface> leftlogo</>
-   <leftlogo> .\src\logo_installer.bmp</>
-   <logo> </>
-   <vb> </>
-   <dao> </>
-   <background> 0</>
-   <dlgwelcome> 1</>
-   <dlgreadme> .\src\README</>
-   <dlglic> .\src\gpl_installer.rtf</>
-   <dlgcustpath> </>
-   <dlgenfpath> 0</>
-   <dlgsavepath> 1</>
-   <dlgautoprog> 1</>
-   <dlgfinish> 1</>
-   <comptype> defnorm</>
-   <solid> 0</>
-   <srcfolder> </>
-   <ifexist> over</>
-   <runafter> </>
-   <runconfirm> 1</>
-   <uninclude> 1</>
-   <unicon> Uninstall - 2</>
-   <unshortcut> 1</>
-   <unrun> </>
-   <silent> 0</>
-   <unfeed> </>
-   <unautoclose> 1</>
-   <unfinish> 1</>
-   <bl> My Demo</>
-   <blurl> </>
-   <bghead> </>
-   <bgfoot> </> 
-   <bgback> </>
-   <files listview >
-<_><src>..\Release\bin\libjack.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjack.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjack.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_lsp.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_metro.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_midi_latency_test.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjack.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\jack_net.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\jack_netone.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\jack_dummy.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\jack_loopback.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\jack_winmme.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\jack_portaudio.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\netmanager.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\audioadapter.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack\netadapter.dll</><dest>sys</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\jack_midi_dump.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\portaudio_x86.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\control.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\intclient.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\jack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\jslist.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\midiport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\ringbuffer.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\session.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\statistics.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\systemdeps.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
-<_><src>..\..\common\jack\thread.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\transport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\types.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\weakjack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
-<_><src>..\..\common\jack\weakmacros.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
-<_><src>.\src\32bits\JackRouter.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\JackRouter.ini</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\msvcr100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\msvcp100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\QtGui4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\QtXml4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\libgcc_s_dw2-1.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\COPYING</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\README</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-
-   </files>
-   <runx listview >
-   </runx>
-   <registry listview >
-      
-   </registry>
-   <shcut listview >
-      <_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
-<_><shpath>prog</><shname>Jack PortAudio</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d portaudio</><workpath>inst</><workcust></><icon></></>
-<_><shpath>prog</><shname>Jack Control</><tarpath>inst</><tarname>qjackctl.exe</><cmdline></><workpath>inst</><workcust></><icon>jackdmp.exe</></>
-<_><shpath>prog</><shname>Jack Command</><tarpath>sys</><tarname>cmd.exe</><cmdline></><workpath>inst</><workcust></><icon></></>
-
-   </shcut>
-   <ini listview >
-      
-   </ini>
-   <copy listview >
-      
-   </copy>
-   <activex listview >
-      <_><path>inst</><name>32bits\JackRouter.dll</></>
-
-   </activex>
-   <font listview >
-      
-   </font>
-   <ext listview >
-      
-   </ext>
-   <mreg listview >
-      
-   </mreg>
-   <macros> Pathadd=</>
-</project>
-\ No newline at end of file
diff --git a/windows/Setup/jack64.ci b/windows/Setup/jack64.ci
deleted file mode 100644
index 2a4815c0..00000000
--- a/windows/Setup/jack64.ci
+++ /dev/null
@@ -1,157 +0,0 @@
-<*project
-      version = 4 civer = "Free v4.14.5" winver = "2.8/6.1.7600" > 
-   <output> .</>
-   <exename> Jack_v1.9.12_64_setup.exe</>
-   <digitsign> </>
-   <appname> Jack</>
-   <password> </>
-   <addlang> </>
-   <icon> Default - 2</>
-   <selfextr> 1</>
-   <voltype> nolimit</>
-   <volsize> </>
-   <volpattern> disk%i.pak</>
-   <load> </>
-   <loadtime> 1000</>
-   <checktype> admin</>
-   <chkname> </>
-   <chkmsg> </>
-   <dlgfont> Verdana,8</>
-   <lang> English</>
-   <theme> Green</>
-   <iface> leftlogo</>
-   <leftlogo> .\src\logo_installer.bmp</>
-   <logo> </>
-   <vb> </>
-   <dao> </>
-   <background> 0</>
-   <dlgwelcome> 1</>
-   <dlgreadme> .\src\README</>
-   <dlglic> .\src\gpl_installer.rtf</>
-   <dlgcustpath> </>
-   <dlgenfpath> 0</>
-   <dlgsavepath> 1</>
-   <dlgautoprog> 1</>
-   <dlgfinish> 1</>
-   <comptype> defnorm</>
-   <solid> 0</>
-   <srcfolder> </>
-   <ifexist> over</>
-   <runafter> </>
-   <runconfirm> 1</>
-   <uninclude> 1</>
-   <unicon> Uninstall - 2</>
-   <unshortcut> 1</>
-   <unrun> </>
-   <silent> 0</>
-   <unfeed> </>
-   <unautoclose> 1</>
-   <unfinish> 1</>
-   <bl> My Demo</>
-   <blurl> </>
-   <bghead> </>
-   <bgfoot> </> 
-   <bgback> </>
-   <files listview >
-<_><src>..\Release64\bin\libjack64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjack64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjack64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjack64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjackserver64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjackserver64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjackserver64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\libjackserver64.dll</><dest>win</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjack.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjack.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjack.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjack.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\portaudio_x86.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_lsp.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_metro.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_midi_latency_test.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\jack_net.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\jack_netone.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\jack_dummy.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\jack_loopback.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\jack_winmme.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\jack_portaudio.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\netmanager.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\audioadapter.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack\netadapter.dll</><dest>win</><custom>jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\Release64\bin\jack_midi_dump.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\control.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\intclient.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\jack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\jslist.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\midiport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\ringbuffer.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\session.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\statistics.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\systemdeps.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
-<_><src>..\..\common\jack\thread.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\transport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\types.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
-<_><src>..\..\common\jack\weakjack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
-<_><src>..\..\common\jack\weakmacros.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
-<_><src>.\src\32bits\JackRouter.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\JackRouter.ini</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\msvcr100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\32bits\msvcp100.dll</><dest>inst</><custom>32bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\64bits\JackRouter.dll</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\64bits\JackRouter.ini</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\64bits\msvcr100.dll</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\64bits\msvcp100.dll</><dest>inst</><custom>64bits</><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\QtGui4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\QtXml4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\qjackctl\libgcc_s_dw2-1.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\COPYING</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-<_><src>.\src\README</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
-
-   </files>
-   <runx listview >
-    </runx>
-   <registry listview >
-      
-   </registry>
-   <shcut listview >
-      <_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
-<_><shpath>prog</><shname>Jack PortAudio</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d portaudio</><workpath>inst</><workcust></><icon></></>
-<_><shpath>prog</><shname>Jack Control</><tarpath>inst</><tarname>qjackctl.exe</><cmdline></><workpath>inst</><workcust></><icon>jackdmp.exe</></>
-<_><shpath>prog</><shname>Jack Command</><tarpath>sys</><tarname>cmd.exe</><cmdline></><workpath>inst</><workcust></><icon></></>
-
-   </shcut>
-   <ini listview >
-      
-   </ini>
-   <copy listview >
-      
-   </copy>
-   <activex listview >
-	  <_><path>inst</><name>32bits\JackRouter.dll</></>
- 	  <_><path>inst</><name>64bits\JackRouter.dll</></>
-
-   </activex>
-   <font listview >
-      
-   </font>
-   <ext listview >
-      
-   </ext>
-   <mreg listview >
-      
-   </mreg>
-   <macros> Pathadd=</>
-</project>
-\ No newline at end of file
diff --git a/windows/Setup/src/32bits/JackRouter.dll b/windows/Setup/src/32bits/JackRouter.dll
deleted file mode 100644
index 72b80d14..00000000
--- a/windows/Setup/src/32bits/JackRouter.dll
+++ /dev/null
diff --git a/windows/Setup/src/32bits/JackRouter.ini b/windows/Setup/src/32bits/JackRouter.ini
deleted file mode 100644
index 0131071a..00000000
--- a/windows/Setup/src/32bits/JackRouter.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[IO]
-input=4
-output=4
-float-sample=0
-
-[AUTO_CONNECT]
-input=1
-output=1
-alias=0
-\ No newline at end of file
diff --git a/windows/Setup/src/64bits/JackRouter.dll b/windows/Setup/src/64bits/JackRouter.dll
deleted file mode 100644
index 2840cc95..00000000
--- a/windows/Setup/src/64bits/JackRouter.dll
+++ /dev/null
diff --git a/windows/Setup/src/64bits/JackRouter.ini b/windows/Setup/src/64bits/JackRouter.ini
deleted file mode 100644
index 1bed0b89..00000000
--- a/windows/Setup/src/64bits/JackRouter.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[IO]
-input=4
-output=4
-float-sample=0
-
-[AUTO_CONNECT]
-input=1
-output=1
-alias=0
diff --git a/windows/Setup/src/COPYING b/windows/Setup/src/COPYING
deleted file mode 100644
index 94a9ed02..00000000
--- a/windows/Setup/src/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/windows/Setup/src/README b/windows/Setup/src/README
deleted file mode 100644
index 74205ee5..00000000
--- a/windows/Setup/src/README
+++ /dev/null
@@ -1,73 +0,0 @@
-=============================================
-JACK on Windows
-=============================================
-
-This installer will install everything to use Jack Audio Connection Kit (JACK) (www.jackaudio.org) on Windows.
-
-
-=============================================
-QJACKCTL on Windows
-=============================================
-
-This is a latest version of Rui Nuno Capela QJACKCTL application (http://qjackctl.sourceforge.net/) compiled on Windows. 
-It is compiled from the latest CVS version which is using QT4 framework. To uses it:
-
-- start qjackctl.exe and configure it the following way:
-
-	- in Setup/Setting, use "jackd -S" at the "Server Path" item. WARNING: on Windows the "-S" parameter is *mandatory* to have the jack server correctly working!!
-
-	- in Setup/Setting, use "portaudio" at the "Driver" item
-
-	- in Setup/Misc, check the "Start JACK audio server at application startup" box
-
-- quit QJACKCTL and start is again, it should now launch the jack server. Quitting QJACKCTL will now close the jack server.
-
-Starting the jack server with another audio device installed on the machine (like an ASIO card) can now be done directly in QJACKCTL. 
-A ">" button at the right of the interface button allows to list the name of all available devices, driven either by "MME", "DirectSound", or "ASIO".
-Alternatively using the following command allows to display the names of available devices:
-
-- jackd -d portaudio -l to display the entire list of available audio devices. (jackd -d portaudio -h will display all portaudio driver features)
-
-Then start jackd with the device you want, by using its name, for example:
-
-- jackd -R -S -d portaudio -d "ASIO::MOTU Audio ASIO", then start QJACKCTL. QJACKCTL will see the jackd server already running and then can be used normally.
-
-
-=============================================
-Jack MIDI
-=============================================
-
-A first version of a JACK MIDI <==> Windows MIDI bridge (using Windows MME API) is available. 
-If can be activated using the -X parameter in jackd command line. So add "-X winmme" in QJACKCTL settings (something like "jackd -S -X winmme"). 
-The WinMME driver will scan MIDI input/output ports, open corresponding JACK MIDI ports and convert MIDI in/out into JACK MIDI messages. 
-QJACKCTL MIDI connection windows can then be used.
-
-
-=============================================
-JackRouter JACK/ASIO driver
-=============================================
-
-JackRouter is an ASIO driver that allows any ASIO compatible application to become a JACK client, thus exchange audio with any other "native" or "Jackified" application. This driver is registered in the system by the installer and becomes available in the list of ASIO drivers when the JACK server is running. A "JackRouter.ini" configuration file allows the application to configure how the JackRouter driver behaves.
-
-	- [IO]: 
-		- input/output : the application can obtain any number if JACK input/output ports (not necessarily equal to the audio card input/output number). [Note that some applications force their input/output channel number].
-		- float-sample : be default the JackRouter will present audio samples in integer format for the application. Use float-sample=1 so that audio samples are presented in float format for the application (thus saving float/integer conversion time).
-	
-
-	- [AUTO_CONNECT] : 
-		- input/output : when 1, the application JACK port will automatically be connected to the machine input/output JACK ports.
-		- alias : with ASIO drivers, real channels names will be associated to the JACK port as aliases and will be returned when the application request channels names.
-
-
-=============================================
-Known problems
-=============================================
-
-- starting/stopping the server several times in QJACKCTL may not work correctly. You may have to quit QJACKCTL and launch it again.
-
-
-=============================================
-Grame : Computer Music Research Laboratory
-Web : http://www.grame.fr/Research
-E-mail : letz@grame.fr
-=============================================
-\ No newline at end of file
diff --git a/windows/Setup/src/gpl_installer.rtf b/windows/Setup/src/gpl_installer.rtf
deleted file mode 100644
index 37c2dec1..00000000
--- a/windows/Setup/src/gpl_installer.rtf
+++ /dev/null
diff --git a/windows/Setup/src/jack.ico b/windows/Setup/src/jack.ico
deleted file mode 100644
index 905c8be7..00000000
--- a/windows/Setup/src/jack.ico
+++ /dev/null
diff --git a/windows/Setup/src/logo_installer.bmp b/windows/Setup/src/logo_installer.bmp
deleted file mode 100644
index f3a18433..00000000
--- a/windows/Setup/src/logo_installer.bmp
+++ /dev/null
diff --git a/wscript b/wscript
index 3b6ac404..dd8cb6a3 100644
--- a/wscript
+++ b/wscript
@@ -11,7 +11,7 @@ import sys
 from waflib import Logs, Options, Task, Utils
 from waflib.Build import BuildContext, CleanContext, InstallContext, UninstallContext
 
-VERSION='1.9.15'
+VERSION='1.9.16'
 APPNAME='jack'
 JACK_API_VERSION = '0.1.0'