Merge branch 'master' into python3-waf-upgrade

ChangeLog

@@ -36,6 +36,22 @@ John Emmas
   Jackdmp changes log
 ---------------------------
 
+2012-03-15 Stephane Letz  <letz@grame.fr>
+
+	* POST_PACKED_STRUCTURE used for jack_latency_range_t type.
+
+2012-03-09 Stephane Letz  <letz@grame.fr>
+
+	* Remove JACK_32_64 flag, so POST_PACKED_STRUCTURE now always used.
+
+2012-02-10 Stephane Letz  <letz@grame.fr>
+
+	* Improve libjacknet master mode.
+
+2012-02-09 Stephane Letz  <letz@grame.fr>
+
+	* In control API, UNIX like sigset_t replaced by more abstract jackctl_sigmask_t * opaque struct.
+
 2012-02-01 Stephane Letz  <letz@grame.fr>
 
 	* Check server API callback from notification thread.

common/JackAC3Encoder.cpp

@@ -0,0 +1,317 @@
+/*
+Copyright (C) 2006 Jesse Chappell <jesse@essej.net> (AC3Jack)
+Copyright (C) 2012 Grame
+
+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 2 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, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "JackAC3Encoder.h"
+#include "JackError.h"
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+
+#define max(x,y) (((x)>(y)) ? (x) : (y))
+#define min(x,y) (((x)<(y)) ? (x) : (y))
+
+namespace Jack
+{
+    
+#ifndef __ppc__
+
+JackAC3Encoder::JackAC3Encoder(const JackAC3EncoderParams& params)
+{
+    aften_set_defaults(&fAftenContext);
+    
+    fAftenContext.channels = params.channels;
+	fAftenContext.samplerate = params.sample_rate;
+	fAftenContext.params.bitrate = params.bitrate;
+
+	int acmod = A52_ACMOD_MONO;
+	int lfe = params.lfe;
+   
+	switch (params.channels) {
+    
+        case 1: acmod = A52_ACMOD_MONO; break;
+        case 2: acmod = A52_ACMOD_STEREO; break;
+        case 3: acmod = A52_ACMOD_3_0; break;
+        case 4: acmod = A52_ACMOD_2_2; break;
+        case 5: acmod = A52_ACMOD_3_2; break;
+            break;
+            
+        default: 
+            break;
+	}
+
+	if (lfe) {
+		fAftenContext.channels += 1;
+	}
+	
+	fAftenContext.acmod = acmod;
+	fAftenContext.lfe = lfe;
+	fAftenContext.sample_format = A52_SAMPLE_FMT_FLT;
+	fAftenContext.verbose = 1;
+
+	fAftenContext.system.n_threads = 1;
+    
+    // create interleaved framebuffer for MAX_AC3_CHANNELS
+	fSampleBuffer = new float[MAX_AC3_CHANNELS * A52_SAMPLES_PER_FRAME];
+    
+    // create AC3 buffer
+	fAC3Buffer = new unsigned char[A52_MAX_CODED_FRAME_SIZE];
+	memset(fAC3Buffer, 0, A52_MAX_CODED_FRAME_SIZE);
+    
+    fZeroBuffer = new unsigned char[SPDIF_FRAME_SIZE];
+	memset(fZeroBuffer, 0, SPDIF_FRAME_SIZE);
+    
+    fRingBuffer = jack_ringbuffer_create(32768);
+  	
+    fOutSizeByte = 0;
+    fFramePos = 0;
+    
+    fSampleRate = 0;
+    fByteRate = 0;
+}
+
+bool JackAC3Encoder::Init(jack_nframes_t sample_rate)
+{
+    fSampleRate = sample_rate;
+	fByteRate = fSampleRate * sizeof(short) * 2;
+    return (aften_encode_init(&fAftenContext) == 0);
+}
+        
+JackAC3Encoder::~JackAC3Encoder()
+{
+    aften_encode_close(&fAftenContext);
+    
+    delete [] fSampleBuffer;
+    delete [] fAC3Buffer;
+    delete [] fZeroBuffer;
+    
+    if (fRingBuffer) {
+        jack_ringbuffer_free(fRingBuffer);
+    }
+}
+
+void JackAC3Encoder::Process(float** inputs_buffer, float** outputs_buffer, int nframes)
+{
+    // fill and process frame buffers as appropriate
+	jack_nframes_t frames_left = A52_SAMPLES_PER_FRAME - fFramePos;
+	jack_nframes_t offset = 0;
+
+	while (offset < nframes)
+	{
+		if ((nframes - offset) >= frames_left) {
+        
+			// copy only frames_left more data
+			jack_nframes_t pos = fFramePos * fAftenContext.channels;
+			for (jack_nframes_t spos = offset; spos < offset + frames_left; ++spos) {
+				for (size_t i = 0; i < fAftenContext.channels; ++i) {
+					fSampleBuffer[pos + i] = inputs_buffer[i][spos];
+				}
+				pos += fAftenContext.channels;
+			}  
+			
+			// use interleaved version
+            int res = aften_encode_frame(&fAftenContext, fAC3Buffer + SPDIF_HEADER_SIZE, fSampleBuffer);
+            if (res < 0) {
+                jack_error("aften_encode_frame error !!");
+                return;
+            }
+            
+            fOutSizeByte = res;
+	
+			FillSpdifHeader(fAC3Buffer, fOutSizeByte + SPDIF_HEADER_SIZE);
+			
+			// push AC3 output to SPDIF ring buffer
+			float calc_ac3byterate = (fOutSizeByte * fSampleRate / (float) A52_SAMPLES_PER_FRAME);  
+			jack_nframes_t silencebytes = (jack_nframes_t) (fOutSizeByte * (fByteRate / calc_ac3byterate)) - fOutSizeByte - SPDIF_HEADER_SIZE;
+			
+            jack_ringbuffer_write(fRingBuffer, (const char *)fAC3Buffer, fOutSizeByte + SPDIF_HEADER_SIZE);
+
+            // write the proper remainder of zero padding (inefficient, should be memsetting)
+            jack_ringbuffer_write(fRingBuffer, (const char *)fZeroBuffer, silencebytes);
+			
+			offset += frames_left;
+			frames_left = A52_SAMPLES_PER_FRAME;
+			fFramePos = 0;
+            
+		} else {
+        
+			// copy incoming data into frame buffers without processing
+			jack_nframes_t pos = fFramePos * fAftenContext.channels;
+			for (jack_nframes_t spos = offset; spos < nframes; ++spos) {
+				for (size_t i = 0; i < fAftenContext.channels; ++i) {
+					fSampleBuffer[pos + i] = inputs_buffer[i][spos];
+				}
+				pos += fAftenContext.channels;
+			}  
+
+			fFramePos += (nframes - offset);
+			offset += (nframes-offset);
+		}
+	}
+
+	Output2Driver(outputs_buffer, nframes);
+}
+
+void JackAC3Encoder::FillSpdifHeader(unsigned char* buf, int outsize)
+{
+	// todo, use outsize and not assume the fixed frame size?
+	int ac3outsize = outsize - SPDIF_HEADER_SIZE;
+	
+	buf[0] = 0x72; buf[1] = 0xf8;	/* spdif syncword */
+	buf[2] = 0x1f; buf[3] = 0x4e;	/* .............. */
+	buf[4] = 0x01;                  /* AC3 data */
+	buf[5] = buf[13] & 7;           /* bsmod, stream = 0 */
+	buf[6] = (ac3outsize << 3) & 0xff;
+	buf[7] = (ac3outsize >> 5) & 0xff;
+
+#if !IS_BIGENDIAN
+	swab(buf+SPDIF_HEADER_SIZE, buf + SPDIF_HEADER_SIZE, ac3outsize);
+#endif
+}
+
+int JackAC3Encoder::Output2Driver(float** outputs, jack_nframes_t nframes)
+{
+	int wrotebytes = 0;
+	jack_nframes_t nframes_left = nframes;
+	
+	if (jack_ringbuffer_read_space(fRingBuffer) == 0) {
+    
+		// just write silence
+		memset(outputs[0], 0, nframes * sizeof(jack_default_audio_sample_t));
+		memset(outputs[1], 0, nframes * sizeof(jack_default_audio_sample_t));	
+        	
+	} else {
+    
+	  jack_ringbuffer_data_t rb_data[2];
+
+		jack_ringbuffer_get_read_vector(fRingBuffer, rb_data);
+		
+		while (nframes_left > 0 && rb_data[0].len > 4) {
+	
+			jack_nframes_t towrite_frames = (rb_data[0].len) / (sizeof(short) * 2);
+			towrite_frames = min(towrite_frames, nframes_left);
+			
+			// write and deinterleave into the two channels
+#if 1
+			sample_move_dS_s16(outputs[0] + (nframes - nframes_left), (char *) rb_data[0].buf, towrite_frames, sizeof(short) * 2);
+			sample_move_dS_s16(outputs[1] + (nframes - nframes_left), (char *) rb_data[0].buf + sizeof(short), towrite_frames, sizeof(short) * 2);
+#else
+			sample_move_dS_s16_24ph(outputs[0] + (nframes - nframes_left), (char *) rb_data[0].buf, towrite_frames, sizeof(short) * 2);
+			sample_move_dS_s16_24ph(outputs[1] + (nframes - nframes_left), (char *) rb_data[0].buf + sizeof(short), towrite_frames, sizeof(short) * 2);
+#endif			
+			wrotebytes = towrite_frames * sizeof(short) * 2;
+			nframes_left -= towrite_frames;
+			
+			jack_ringbuffer_read_advance(fRingBuffer, wrotebytes);
+			jack_ringbuffer_get_read_vector(fRingBuffer, rb_data);
+		}
+
+		if (nframes_left > 0) {
+			// write silence
+			memset(outputs[0] + (nframes - nframes_left), 0, (nframes_left) * sizeof(jack_default_audio_sample_t));
+			memset(outputs[1] + (nframes - nframes_left), 0, (nframes_left) * sizeof(jack_default_audio_sample_t));		
+		}
+	}
+
+	return wrotebytes;
+}
+
+void JackAC3Encoder::sample_move_dS_s16(jack_default_audio_sample_t* dst, char *src, jack_nframes_t nsamples, unsigned long src_skip) 
+{
+	/* ALERT: signed sign-extension portability !!! */
+	while (nsamples--) {
+		*dst = (*((short *) src)) / SAMPLE_MAX_16BIT;
+		dst++;
+		src += src_skip;
+	}
+}	
+
+void JackAC3Encoder::sample_move_dS_s16_24ph(jack_default_audio_sample_t* dst, char *src, jack_nframes_t nsamples, unsigned long src_skip) 
+{
+	/* ALERT: signed sign-extension portability !!! */
+	while (nsamples--) {
+		*dst = (((int)(*((short *) src))) << 8) / SAMPLE_MAX_24BIT;
+		dst++;
+		src += src_skip;
+	}
+}
+
+void JackAC3Encoder::GetChannelName(const char* name, const char* alias, char* portname, int channel)
+{
+    /*
+	 * 2 channels = L, R
+	 * 3 channels = L, C, R
+	 * 4 channels = L, R, LS, RS
+	 * 5 ch       = L, C, R,  LS, RS
+	 * 6 ch       = L, C, R,  LS, RS, LFE
+	 */
+     
+     const char* AC3_name = "";
+     
+     switch (channel) {
+     
+        case 0:
+            AC3_name = "AC3_1_Left";
+            break;
+            
+        case 1:
+            if (fAftenContext.channels == 2 || fAftenContext.channels == 4) {
+                AC3_name = "AC3_2_Right";
+            } else {
+                AC3_name = "AC3_2_Center";
+            }
+            break;
+            
+        case 2:
+            if (fAftenContext.channels == 4) {
+                AC3_name = "AC3_3_LeftSurround";
+            } else {
+                AC3_name = "AC3_3_Right";
+            }
+            break;
+        
+        case 3:
+            if (fAftenContext.channels == 4) {
+                AC3_name = "AC3_4_RightSurround";
+            } else {
+                AC3_name = "AC3_4_LeftSurround";
+            }
+            break;
+            
+        case 4:
+            if (fAftenContext.channels > 4) {
+               AC3_name = "AC3_5_RightSurround";
+			}
+            break;
+            
+        default:
+            break;
+     }
+     
+     // Last channel
+     if (fAftenContext.lfe && (channel == fAftenContext.channels - 1)) {
+        sprintf(portname, "%s:%s:AC3_%d_LFE", name, alias, fAftenContext.channels);
+     } else {
+        sprintf(portname, "%s:%s:%s", name, alias, AC3_name);
+     }
+}
+    
+#endif
+
+} // end of namespace

common/JackAC3Encoder.h

@@ -0,0 +1,100 @@
+/*
+Copyright (C) 2006 Jesse Chappell <jesse@essej.net> (AC3Jack)
+Copyright (C) 2012 Grame
+
+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 2 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, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __JackAC3Encoder__
+#define __JackAC3Encoder__
+
+#include <aften/aften.h>
+#include <aften/aften-types.h>
+
+#include "ringbuffer.h"
+#include "types.h"
+
+#define MAX_AC3_CHANNELS 6
+
+#define SPDIF_HEADER_SIZE 8
+#define SPDIF_FRAME_SIZE 6144
+
+#define SAMPLE_MAX_16BIT  32768.0f
+#define SAMPLE_MAX_24BIT  8388608.0f
+
+namespace Jack
+{
+
+struct JackAC3EncoderParams
+{
+	int64_t duration;
+	unsigned int channels;
+	int bitdepth;
+	int bitrate;
+	unsigned int sample_rate;
+	bool lfe;
+};
+
+class JackAC3Encoder
+{
+
+    private:
+
+		AftenContext fAftenContext;
+        jack_ringbuffer_t* fRingBuffer;
+        
+        float* fSampleBuffer;
+        unsigned char* fAC3Buffer;
+        unsigned char* fZeroBuffer;
+        
+        int fOutSizeByte; 
+        
+        jack_nframes_t fFramePos;
+        jack_nframes_t fSampleRate;
+        jack_nframes_t fByteRate;
+        
+        void FillSpdifHeader(unsigned char* buf, int outsize);
+        int Output2Driver(float** outputs, jack_nframes_t nframes);
+        
+        void sample_move_dS_s16(jack_default_audio_sample_t* dst, char *src, jack_nframes_t nsamples, unsigned long src_skip);
+        void sample_move_dS_s16_24ph(jack_default_audio_sample_t* dst, char *src, jack_nframes_t nsamples, unsigned long src_skip);
+
+    public:
+    
+    #ifdef __ppc__
+        JackAC3Encoder(const JackAC3EncoderParams& params) {}
+        virtual ~JackAC3Encoder() {}
+  
+        bool Init(jack_nframes_t sample_rate) {return false;}
+  
+        void Process(float** inputs, float** outputs, int nframes) {}
+        void GetChannelName(const char* name, const char* alias, char* portname, int channel) {}
+    #else
+        JackAC3Encoder(const JackAC3EncoderParams& params);
+        virtual ~JackAC3Encoder();
+    
+        bool Init(jack_nframes_t sample_rate);
+    
+        void Process(float** inputs, float** outputs, int nframes);
+        void GetChannelName(const char* name, const char* alias, char* portname, int channel);
+    #endif
+};
+
+typedef JackAC3Encoder * JackAC3EncoderPtr;
+
+} // end of namespace
+
+#endif

common/JackControlAPI.cpp

@@ -440,57 +440,68 @@ jackctl_server_free_parameters(
 
 #ifdef WIN32
 
-static HANDLE waitEvent;
+struct jackctl_sigmask
+{
+    HANDLE wait_event;
+};
+
+static jackctl_sigmask sigmask;
 
-static void do_nothing_handler(int signum)
+static void signal_handler(int signum)
 {
     printf("Jack main caught signal %d\n", signum);
     (void) signal(SIGINT, SIG_DFL);
-    SetEvent(waitEvent);
+    SetEvent(sigmask.wait_event);
 }
 
-sigset_t
+jackctl_sigmask_t *
 jackctl_setup_signals(
     unsigned int flags)
 {
-    if ((waitEvent = CreateEvent(NULL, FALSE, FALSE, NULL)) == NULL) {
+    if ((sigmask.wait_event = CreateEvent(NULL, FALSE, FALSE, NULL)) == NULL) {
         jack_error("CreateEvent fails err = %ld", GetLastError());
         return 0;
     }
 
-    (void) signal(SIGINT, do_nothing_handler);
-    (void) signal(SIGABRT, do_nothing_handler);
-    (void) signal(SIGTERM, do_nothing_handler);
+    (void) signal(SIGINT, signal_handler);
+    (void) signal(SIGABRT, signal_handler);
+    (void) signal(SIGTERM, signal_handler);
 
-    return (sigset_t)waitEvent;
+    return &sigmask;
 }
 
-void jackctl_wait_signals(sigset_t signals)
+void jackctl_wait_signals(jackctl_sigmask_t * signals)
 {
-    if (WaitForSingleObject(waitEvent, INFINITE) != WAIT_OBJECT_0) {
+    if (WaitForSingleObject(signals->wait_event, INFINITE) != WAIT_OBJECT_0) {
         jack_error("WaitForSingleObject fails err = %ld", GetLastError());
     }
 }
 
 #else
 
+struct jackctl_sigmask
+{
+    sigset_t signals;
+};
+
+static jackctl_sigmask sigmask;
+
 static
 void
-do_nothing_handler(int sig)
+signal_handler(int sig)
 {
     /* this is used by the child (active) process, but it never
        gets called unless we are already shutting down after
        another signal.
     */
     char buf[64];
-    snprintf (buf, sizeof(buf), "Received signal %d during shutdown (ignored)\n", sig);
+    snprintf(buf, sizeof(buf), "Received signal %d during shutdown (ignored)\n", sig);
 }
 
-SERVER_EXPORT sigset_t
+SERVER_EXPORT jackctl_sigmask_t *
 jackctl_setup_signals(
     unsigned int flags)
 {
-    sigset_t signals;
     sigset_t allsignals;
     struct sigaction action;
     int i;
@@ -529,52 +540,52 @@ jackctl_setup_signals(
        after a return from sigwait().
     */
 
-    sigemptyset(&signals);
-    sigaddset(&signals, SIGHUP);
-    sigaddset(&signals, SIGINT);
-    sigaddset(&signals, SIGQUIT);
-    sigaddset(&signals, SIGPIPE);
-    sigaddset(&signals, SIGTERM);
-    sigaddset(&signals, SIGUSR1);
-    sigaddset(&signals, SIGUSR2);
+    sigemptyset(&sigmask.signals);
+    sigaddset(&sigmask.signals, SIGHUP);
+    sigaddset(&sigmask.signals, SIGINT);
+    sigaddset(&sigmask.signals, SIGQUIT);
+    sigaddset(&sigmask.signals, SIGPIPE);
+    sigaddset(&sigmask.signals, SIGTERM);
+    sigaddset(&sigmask.signals, SIGUSR1);
+    sigaddset(&sigmask.signals, SIGUSR2);
 
     /* all child threads will inherit this mask unless they
      * explicitly reset it
      */
 
-    pthread_sigmask(SIG_BLOCK, &signals, 0);
+    pthread_sigmask(SIG_BLOCK, &sigmask.signals, 0);
 
     /* install a do-nothing handler because otherwise pthreads
        behaviour is undefined when we enter sigwait.
     */
 
     sigfillset(&allsignals);
-    action.sa_handler = do_nothing_handler;
+    action.sa_handler = signal_handler;
     action.sa_mask = allsignals;
     action.sa_flags = SA_RESTART|SA_RESETHAND;
 
     for (i = 1; i < NSIG; i++)
     {
-        if (sigismember (&signals, i))
+        if (sigismember (&sigmask.signals, i))
         {
             sigaction(i, &action, 0);
         }
     }
 
-    return signals;
+    return &sigmask;
 }
 
 SERVER_EXPORT void
-jackctl_wait_signals(sigset_t signals)
+jackctl_wait_signals(jackctl_sigmask_t * sigmask)
 {
     int sig;
     bool waiting = true;
 
     while (waiting) {
     #if defined(sun) && !defined(__sun__) // SUN compiler only, to check
-        sigwait(&signals);
+        sigwait(&sigmask->signals);
     #else
-        sigwait(&signals, &sig);
+        sigwait(&sigmask->signals, &sig);
     #endif
         fprintf(stderr, "Jack main caught signal %d\n", sig);
 
@@ -598,7 +609,7 @@ jackctl_wait_signals(sigset_t signals)
         // unblock signals so we can see them during shutdown.
         // this will help prod developers not to lose sight of
         // bugs that cause segfaults etc. during shutdown.
-        sigprocmask(SIG_UNBLOCK, &signals, 0);
+        sigprocmask(SIG_UNBLOCK, &sigmask->signals, 0);
     }
 }
 #endif

common/JackControlAPI.h

@@ -25,15 +25,6 @@
 #include "jslist.h"
 #include "JackCompilerDeps.h"
 
-#ifdef WIN32
-#ifdef __MINGW32__
-#include <sys/types.h>
-typedef _sigset_t	sigset_t;
-#else
-typedef HANDLE sigset_t;
-#endif
-#endif
-
 /** Parameter types, intentionally similar to jack_driver_param_type_t */
 typedef enum
 {
@@ -80,6 +71,9 @@ typedef struct jackctl_internal jackctl_internal_t;
 /** opaque type for parameter object */
 typedef struct jackctl_parameter jackctl_parameter_t;
 
+/** opaque type for sigmask object */
+typedef struct jackctl_sigmask jackctl_sigmask_t;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -87,13 +81,13 @@ extern "C" {
 } /* Adjust editor indent */
 #endif
 
-SERVER_EXPORT sigset_t
+SERVER_EXPORT jackctl_sigmask_t *
 jackctl_setup_signals(
     unsigned int flags);
 
 SERVER_EXPORT void
 jackctl_wait_signals(
-    sigset_t signals);
+    jackctl_sigmask_t * signals);
 
 SERVER_EXPORT jackctl_server_t *
 jackctl_server_create(

common/JackDebugClient.cpp

@@ -294,13 +294,13 @@ int JackDebugClient::PortDisconnect(jack_port_id_t src)
 {
     CheckClient("PortDisconnect");
     if (!fIsActivated)
-        *fStream << "!!! ERROR !!! : Trying to disconnect port  " << src << " while that client has not been activated !" << endl;
+        *fStream << "!!! ERROR !!! : Trying to disconnect port " << src << " while that client has not been activated !" << endl;
     int res = fClient->PortDisconnect(src);
     int i;
     for (i = (fTotalPortNumber - 1); i >= 0; i--) {             // We search the record into the history
         if (fPortList[i].idport == src) {                               // We found the record in sources
             if (fPortList[i].IsUnregistered != 0)
-                *fStream << "!!! ERROR !!! : Disconnecting port  " << src << " previoulsy unregistered !" << endl;
+                *fStream << "!!! ERROR !!! : Disconnecting port " << src << " previoulsy unregistered !" << endl;
             fPortList[i].IsConnected--;
             *fStream << "Disconnecting port " << src << ". " << endl;
             break;
@@ -317,9 +317,17 @@ int JackDebugClient::PortDisconnect(jack_port_id_t src)
 int JackDebugClient::PortIsMine(jack_port_id_t port_index)
 {
     CheckClient("PortIsMine");
+    *fStream << "JackClientDebug : PortIsMine port_index " << port_index << endl;
     return fClient->PortIsMine(port_index);
 }
 
+int JackDebugClient::PortRename(jack_port_id_t port_index, const char* name)
+{
+    CheckClient("PortRename");
+    *fStream << "JackClientDebug : PortRename port_index " << port_index << "name" << name << endl;
+    return fClient->PortRename(port_index, name);
+}
+
 //--------------------
 // Context management
 //--------------------
@@ -327,6 +335,7 @@ int JackDebugClient::PortIsMine(jack_port_id_t port_index)
 int JackDebugClient::SetBufferSize(jack_nframes_t buffer_size)
 {
     CheckClient("SetBufferSize");
+    *fStream << "JackClientDebug : SetBufferSize buffer_size " << buffer_size << endl;
     return fClient->SetBufferSize(buffer_size);
 }
 
@@ -334,13 +343,19 @@ int JackDebugClient::SetFreeWheel(int onoff)
 {
     CheckClient("SetFreeWheel");
     if (onoff && fFreewheel)
-         *fStream << "!!! ERROR !!! : Freewheel setup seems incorrect : set = ON while FW is already ON " << endl;
+        *fStream << "!!! ERROR !!! : Freewheel setup seems incorrect : set = ON while FW is already ON " << endl;
     if (!onoff && !fFreewheel)
-         *fStream << "!!! ERROR !!! : Freewheel setup seems incorrect : set = OFF while FW is already OFF " << endl;
+        *fStream << "!!! ERROR !!! : Freewheel setup seems incorrect : set = OFF while FW is already OFF " << endl;
     fFreewheel = onoff ? true : false;
     return fClient->SetFreeWheel(onoff);
 }
 
+int JackDebugClient::ComputeTotalLatencies()
+{
+    CheckClient("ComputeTotalLatencies");
+    return fClient->ComputeTotalLatencies();
+}
+
 /*
 ShutDown is called:
 - from the RT thread when Execute method fails
@@ -350,6 +365,7 @@ ShutDown is called:
 
 void JackDebugClient::ShutDown()
 {
+    CheckClient("ShutDown");
     fClient->ShutDown();
 }
 
@@ -372,6 +388,7 @@ int JackDebugClient::SetSyncCallback(JackSyncCallback sync_callback, void* arg)
 int JackDebugClient::SetSyncTimeout(jack_time_t timeout)
 {
     CheckClient("SetSyncTimeout");
+    *fStream << "JackClientDebug : SetSyncTimeout timeout " << timeout << endl;
     return fClient->SetSyncTimeout(timeout);
 }
 
@@ -384,6 +401,7 @@ int JackDebugClient::SetTimebaseCallback(int conditional, JackTimebaseCallback t
 void JackDebugClient::TransportLocate(jack_nframes_t frame)
 {
     CheckClient("TransportLocate");
+    *fStream << "JackClientDebug : TransportLocate frame " << frame << endl;
     fClient->TransportLocate(frame);
 }
 
@@ -439,10 +457,11 @@ int JackDebugClient::TimeCallback(jack_nframes_t nframes, void *arg)
     jack_time_t t1 = GetMicroSeconds();
     int res = client->fProcessTimeCallback(nframes, client->fProcessTimeCallbackArg);
     if (res == 0) {
-    jack_time_t t2 = GetMicroSeconds();
+        jack_time_t t2 = GetMicroSeconds();
         long delta = long((t2 - t1) - client->GetEngineControl()->fPeriodUsecs);
-        if (delta > 0 && !client->fFreewheel)
+        if (delta > 0 && !client->fFreewheel) {
             *client->fStream << "!!! ERROR !!! : Process overload of " << delta << " us" << endl;
+        }
     }
     return res;
 }
@@ -450,9 +469,17 @@ int JackDebugClient::TimeCallback(jack_nframes_t nframes, void *arg)
 int JackDebugClient::SetProcessCallback(JackProcessCallback callback, void *arg)
 {
     CheckClient("SetProcessCallback");
+    
     fProcessTimeCallback = callback;
     fProcessTimeCallbackArg = arg;
-    return fClient->SetProcessCallback(TimeCallback, this);
+        
+    if (callback == NULL) {
+        // Clear the callback...
+        return fClient->SetProcessCallback(callback, arg);
+    } else {
+        // Setup the measuring version...
+        return fClient->SetProcessCallback(TimeCallback, this);
+    }
 }
 
 int JackDebugClient::SetXRunCallback(JackXRunCallback callback, void *arg)
@@ -521,9 +548,16 @@ int JackDebugClient::SetLatencyCallback(JackLatencyCallback callback, void *arg)
     return fClient->SetLatencyCallback(callback, arg);
 }
 
+int JackDebugClient::SetProcessThread(JackThreadCallback fun, void *arg)
+{
+    CheckClient("SetProcessThread");
+    return fClient->SetProcessThread(fun, arg);
+}
+
 jack_session_command_t* JackDebugClient::SessionNotify(const char* target, jack_session_event_type_t type, const char* path)
 {
     CheckClient("SessionNotify");
+    *fStream << "JackClientDebug : SessionNotify target " << target << "type " << type << "path " << path << endl;
     return fClient->SessionNotify(target, type, path);
 }
 
@@ -536,24 +570,28 @@ int JackDebugClient::SessionReply(jack_session_event_t* ev)
 char* JackDebugClient::GetUUIDForClientName(const char* client_name)
 {
     CheckClient("GetUUIDForClientName");
+    *fStream << "JackClientDebug : GetUUIDForClientName client_name " << client_name << endl;
     return fClient->GetUUIDForClientName(client_name);
 }
 
 char* JackDebugClient::GetClientNameByUUID(const char* uuid)
 {
     CheckClient("GetClientNameByUUID");
+    *fStream << "JackClientDebug : GetClientNameByUUID uuid " << uuid << endl;
     return fClient->GetClientNameByUUID(uuid);
 }
 
 int JackDebugClient::ReserveClientName(const char* client_name, const char* uuid)
 {
     CheckClient("ReserveClientName");
+    *fStream << "JackClientDebug : ReserveClientName client_name " << client_name << "uuid " << uuid << endl;
     return fClient->ReserveClientName(client_name, uuid);
 }
 
 int JackDebugClient::ClientHasSessionCallback(const char* client_name)
 {
     CheckClient("ClientHasSessionCallback");
+    *fStream << "JackClientDebug : ClientHasSessionCallback client_name " << client_name << endl;
     return fClient->ClientHasSessionCallback(client_name);
 }
 

common/JackDebugClient.h

@@ -83,6 +83,7 @@ class JackDebugClient : public JackClient
         // Context
         int SetBufferSize(jack_nframes_t buffer_size);
         int SetFreeWheel(int onoff);
+        int ComputeTotalLatencies();
         void ShutDown();
         jack_native_thread_t GetThreadID();
 
@@ -95,6 +96,7 @@ class JackDebugClient : public JackClient
         int PortDisconnect(jack_port_id_t src);
 
         int PortIsMine(jack_port_id_t port_index);
+        int PortRename(jack_port_id_t port_index, const char* name);
 
         // Transport
         int ReleaseTimebase();
@@ -129,6 +131,9 @@ class JackDebugClient : public JackClient
         int InternalClientHandle(const char* client_name, jack_status_t* status);
         int InternalClientLoad(const char* client_name, jack_options_t options, jack_status_t* status, jack_varargs_t* va);
         void InternalClientUnload(int ref, jack_status_t* status);
+        
+        // RT Thread
+        int SetProcessThread(JackThreadCallback fun, void *arg);
 
         // Session API
         jack_session_command_t* SessionNotify(const char* target, jack_session_event_type_t type, const char* path);

common/JackMessageBuffer.cpp

@@ -22,6 +22,7 @@
 #include "JackMessageBuffer.h"
 #include "JackGlobals.h"
 #include "JackError.h"
+#include "JackTime.h"
 
 namespace Jack
 {
@@ -167,17 +168,33 @@ int JackMessageBuffer::SetInitCallback(JackThreadInitCallback callback, void *ar
         /* set up the callback */
         fInitArg = arg;
         fInit = callback;
-        /* wake msg buffer thread */
-        fGuard.Signal();
-        /* wait for it to be done */
+        
+        /*
+        The condition variable emulation code does not work reliably on Windows (lost signal).
+        So use a "hackish" way to signal/wait for the result.
+        Probaly better in the long term : use pthread-win32 (http://sourceware.org/pthreads-win32/)
+        // wake msg buffer thread 
+        fGuard.Signal()
+        // wait for it to be done  
         fGuard.Wait();
+        */
+
+        int count = 0;
+        while (fInit && ++count < 1000) {
+            /* wake msg buffer thread */
+            fGuard.Signal();
+            JackSleep(1000);
+        }
+               
         /* and we're done */
         fGuard.Unlock();
+        if (count == 1000) goto error;
         return 0;
-    } else {
-        jack_error("JackMessageBuffer::SetInitCallback : callback cannot be executed");
-        return -1;
     }
+    
+error:
+    jack_error("JackMessageBuffer::SetInitCallback : callback cannot be executed");
+    return -1;
 }
 
 };

common/JackMessageBuffer.h

@@ -57,7 +57,7 @@ class JackMessageBuffer : public JackRunnableInterface
 
     private:
 
-        JackThreadInitCallback fInit;
+        volatile JackThreadInitCallback fInit;
         void* fInitArg;
         JackMessage fBuffers[MB_BUFFERS];
         JackThread fThread;

common/JackNetAPI.cpp

@@ -157,6 +157,8 @@ struct JackNetExtMaster : public JackNetMasterInterface {
         fSocket.SetPort(port);
         fRequest.buffer_size = request->buffer_size;
         fRequest.sample_rate = request->sample_rate;
+        fRequest.audio_input = request->audio_input;
+        fRequest.audio_output = request->audio_output;
         fAudioCaptureBuffer = NULL;
         fAudioPlaybackBuffer = NULL;
         fMidiCaptureBuffer = NULL;
@@ -221,11 +223,10 @@ struct JackNetExtMaster : public JackNetMasterInterface {
             }
 
             if (rx_bytes == sizeof(session_params_t ))  {
-
                 switch (GetPacketType(&fParams)) {
 
                     case SLAVE_AVAILABLE:
-                        if (MasterInit() == 0) {
+                        if (InitMaster(result) == 0) {
                             SessionParamsDisplay(&fParams);
                             fRunning = false;
                         } else {
@@ -244,8 +245,8 @@ struct JackNetExtMaster : public JackNetMasterInterface {
             }
         }
         while (fRunning);
-
-        // Set result paramaters
+ 
+        // Set result parameters
         result->audio_input = fParams.fSendAudioChannels;
         result->audio_output = fParams.fReturnAudioChannels;
         result->midi_input = fParams.fSendMidiChannels;
@@ -259,7 +260,7 @@ struct JackNetExtMaster : public JackNetMasterInterface {
         return -1;
     }
 
-    int MasterInit()
+    int InitMaster(jack_slave_t* result)
     {
         // Check MASTER <==> SLAVE network protocol coherency
         if (fParams.fProtocolVersion != MASTER_PROTOCOL) {
@@ -270,14 +271,45 @@ struct JackNetExtMaster : public JackNetMasterInterface {
         // Settings
         fSocket.GetName(fParams.fMasterNetName);
         fParams.fID = 1;
-        fParams.fSampleEncoder = JackFloatEncoder;
         fParams.fPeriodSize = fRequest.buffer_size;
         fParams.fSampleRate = fRequest.sample_rate;
-
+        
+        if (fRequest.audio_input == -1) {
+            if (fParams.fSendAudioChannels == -1) {
+                jack_error("Error : master and slave use -1 for wanted inputs...");
+                return -1;
+            } else {
+                result->audio_input = fParams.fSendAudioChannels;
+                jack_info("Takes slave %d inputs", fParams.fSendAudioChannels);
+            }
+        } else if (fParams.fSendAudioChannels == -1) {
+            fParams.fSendAudioChannels = fRequest.audio_input;
+            jack_info("Takes master %d inputs", fRequest.audio_input);
+        } else if (fParams.fSendAudioChannels != fRequest.audio_input) {
+            jack_error("Error : master wants %d inputs and slave wants %d inputs...", fRequest.audio_input, fParams.fSendAudioChannels);
+            return -1;
+        } 
+                
+        if (fRequest.audio_output == -1) {
+            if (fParams.fReturnAudioChannels == -1) {
+                jack_error("Error : master and slave use -1 for wanted outputs...");
+                return -1;
+            } else {
+                result->audio_output = fParams.fReturnAudioChannels;
+                jack_info("Takes slave %d outputs", fParams.fReturnAudioChannels);
+            }
+        } else if (fParams.fReturnAudioChannels == -1) {
+            fParams.fReturnAudioChannels = fRequest.audio_output;
+            jack_info("Takes master %d outputs", fRequest.audio_output);
+        } else if (fParams.fReturnAudioChannels != fRequest.audio_output) {
+            jack_error("Error : master wants %d outputs and slave wants %d outputs...", fRequest.audio_output, fParams.fReturnAudioChannels);
+            return -1;
+        }
+        
         // Close request socket
         fSocket.Close();
 
-        // Network slave init
+        /// Network init
         if (!JackNetMasterInterface::Init()) {
             return -1;
         }
@@ -367,7 +399,9 @@ struct JackNetExtMaster : public JackNetMasterInterface {
 
     int Read(int audio_input, float** audio_input_buffer, int midi_input, void** midi_input_buffer)
     {
+        
         try {
+           
             assert(audio_input == fParams.fReturnAudioChannels);
 
             for (int audio_port_index = 0; audio_port_index < audio_input; audio_port_index++) {
@@ -377,11 +411,13 @@ struct JackNetExtMaster : public JackNetMasterInterface {
             for (int midi_port_index = 0; midi_port_index < midi_input; midi_port_index++) {
                 fNetMidiPlaybackBuffer->SetBuffer(midi_port_index, ((JackMidiBuffer**)midi_input_buffer)[midi_port_index]);
             }
-
-            if (SyncRecv() == SOCKET_ERROR) {
-                return 0;
+         
+            //receive sync
+            int res = SyncRecv();
+            if ((res == 0) || (res == SOCKET_ERROR)) {
+                return res;
             }
-
+       
             DecodeSyncPacket();
             return DataRecv();
 
@@ -394,6 +430,7 @@ struct JackNetExtMaster : public JackNetMasterInterface {
      int Write(int audio_output, float** audio_output_buffer, int midi_output, void** midi_output_buffer)
      {
         try {
+            
             assert(audio_output == fParams.fSendAudioChannels);
 
             for (int audio_port_index = 0; audio_port_index < audio_output; audio_port_index++) {
@@ -403,20 +440,32 @@ struct JackNetExtMaster : public JackNetMasterInterface {
             for (int midi_port_index = 0; midi_port_index < midi_output; midi_port_index++) {
                 fNetMidiCaptureBuffer->SetBuffer(midi_port_index, ((JackMidiBuffer**)midi_output_buffer)[midi_port_index]);
             }
+            
+            
+            if (IsSynched()) {  // only send if connection is "synched"
+            
+                EncodeSyncPacket();
+
+                if (SyncSend() == SOCKET_ERROR) {
+                    return SOCKET_ERROR;
+                }
 
-            EncodeSyncPacket();
-
-            if (SyncSend() == SOCKET_ERROR) {
-                return SOCKET_ERROR;
+                //send data
+                if (DataSend() == SOCKET_ERROR) {
+                    return SOCKET_ERROR;
+                }
+                
+            } else {
+                jack_info("Connection is not synched, skip cycle...");
             }
-
-            return DataSend();
+            
+            return 0;
 
         } catch (JackNetException& e) {
             jack_error("Connection lost.");
             return -1;
         }
-     }
+    }
 
     // Transport
     void EncodeTransportData()
@@ -678,9 +727,9 @@ struct JackNetExtSlave : public JackNetSlaveInterface, public JackRunnableInterf
             }
             return false;
         } catch (JackNetException& e) {
-
             // Otherwise just restart...
             e.PrintMessage();
+            jack_info("NetSlave is restarted");
             fThread.DropRealTime();
             fThread.SetStatus(JackThread::kIniting);
             FreePorts();

common/JackNetAdapter.cpp

@@ -260,6 +260,7 @@ namespace Jack
                 }
             return false;
         } catch (JackNetException& e) {
+            // Otherwise just restart...
             e.PrintMessage();
             jack_info("NetAdapter is restarted");
             Reset();

common/JackNetInterface.cpp

@@ -262,7 +262,7 @@ namespace Jack
 
     bool JackNetMasterInterface::Init()
     {
-        jack_log("JackNetMasterInterface::Init, ID %u", fParams.fID);
+        jack_log("JackNetMasterInterface::Init : ID %u", fParams.fID);
 
         session_params_t host_params;
         uint attempt = 0;
@@ -504,7 +504,7 @@ namespace Jack
         while (!fRxHeader.fIsLastPckt) {
             // how much data is queued on the rx buffer ?
             rx_bytes = Recv(fParams.fMtu, MSG_PEEK);
-
+         
             // error here, problem with recv, just skip the cycle (return -1)
             if (rx_bytes == SOCKET_ERROR) {
                 return rx_bytes;
@@ -528,7 +528,7 @@ namespace Jack
                 }
             }
         }
-
+   
         return rx_bytes;
     }
 

common/JackNetManager.cpp

@@ -491,7 +491,7 @@ namespace Jack
     #endif
 
         } else {
-            jack_error("Connection is not synched, skip cycle...");
+            jack_info("Connection is not synched, skip cycle...");
         }
 
         //receive sync
@@ -711,6 +711,7 @@ namespace Jack
             session_params_t net_params;
             rx_bytes = fSocket.CatchHost(&net_params, sizeof(session_params_t), 0);
             SessionParamsNToH(&net_params, &host_params);
+            
             if ((rx_bytes == SOCKET_ERROR) && (fSocket.GetError() != NET_NO_DATA)) {
                 jack_error("Error in receive : %s", StrError(NET_ERROR_CODE));
                 if (++attempt == 10) {

common/JackTools.cpp

@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+#include <signal.h>
 
 #ifdef WIN32
 #include <process.h>
@@ -36,11 +37,7 @@ namespace Jack {
 
     void JackTools::KillServer()
     {
-#ifdef WIN32
-        exit(1);
-#else
-        kill(GetPID(), SIGINT);
-#endif
+        raise(SIGINT);
     }
 
     void JackTools::ThrowJackNetException()

common/Jackdmp.cpp

@@ -227,7 +227,7 @@ int main(int argc, char** argv)
     int do_unlock = 0;
     int loopback = 0;
     bool show_version = false;
-    sigset_t signals;
+    jackctl_sigmask_t * sigmask;
     jackctl_parameter_t* param;
     union jackctl_parameter_value value;
 
@@ -450,7 +450,7 @@ int main(int argc, char** argv)
     }
 
     // Setup signals
-    signals = jackctl_setup_signals(0);
+    sigmask = jackctl_setup_signals(0);
 
     // Open server
     if (! jackctl_server_open(server_ctl, master_driver_ctl)) {
@@ -520,7 +520,7 @@ int main(int argc, char** argv)
     return_value = 0;
 
     // Waits for signal
-    jackctl_wait_signals(signals);
+    jackctl_wait_signals(sigmask);
 
  stop_server:
     if (!jackctl_server_stop(server_ctl)) {

common/jack/control.h

@@ -28,7 +28,7 @@
 
 #ifndef JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
 #define JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
-
+
 #include <types.h>
 #include <jack/jslist.h>
 #include <jack/systemdeps.h>
@@ -82,6 +82,9 @@ typedef struct jackctl_internal jackctl_internal_t;
 /** opaque type for parameter object */
 typedef struct jackctl_parameter jackctl_parameter_t;
 
+/** opaque type for sigmask object */
+typedef struct jackctl_sigmask jackctl_sigmask_t;
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -103,7 +106,7 @@ extern "C" {
  *
  * @return the configurated signal set.
  */
-sigset_t
+jackctl_sigmask_t *
 jackctl_setup_signals(
     unsigned int flags);
 
@@ -114,7 +117,7 @@ jackctl_setup_signals(
  */
 void
 jackctl_wait_signals(
-    sigset_t signals);
+    jackctl_sigmask_t * signals);
 
 /**
  * Call this function to create server object.

common/jack/jack.h

@@ -76,6 +76,11 @@ jack_get_version(
 const char *
 jack_get_version_string() JACK_OPTIONAL_WEAK_EXPORT;
 
+/**
+ * @defgroup ClientFunctions Creating & manipulating clients
+ * @{
+ */
+
 /**
  * Open an external client session with a JACK server.  This interface
  * is more complex but more powerful than jack_client_new().  With it,
@@ -170,7 +175,7 @@ int jack_internal_client_new (const char *client_name,
 /**
  * Remove an internal client from a JACK server.
  *
- * @deprecated Please use jack_internal_client_load().
+ * @deprecated Please use jack_internal_client_unload().
  */
 void jack_internal_client_close (const char *client_name) JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT;
 
@@ -198,9 +203,9 @@ int jack_get_client_pid (const char *name) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * @return the pthread ID of the thread running the JACK client side
- * code.
+ * real-time code.
  */
-jack_native_thread_t jack_client_thread_id (jack_client_t *) JACK_OPTIONAL_WEAK_EXPORT;
+jack_native_thread_t jack_client_thread_id (jack_client_t *client) JACK_OPTIONAL_WEAK_EXPORT;
 
 /*@}*/
 
@@ -224,7 +229,7 @@ int jack_is_realtime (jack_client_t *client) JACK_OPTIONAL_WEAK_EXPORT;
  *
  * @deprecated Please use jack_cycle_wait() and jack_cycle_signal() functions.
  */
-jack_nframes_t jack_thread_wait (jack_client_t*, int status) JACK_OPTIONAL_WEAK_EXPORT;
+jack_nframes_t jack_thread_wait (jack_client_t *client, int status) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * Wait until this JACK client should process data.
@@ -432,9 +437,9 @@ int jack_set_sample_rate_callback (jack_client_t *client,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_set_client_registration_callback (jack_client_t *,
-                       JackClientRegistrationCallback
-                                           registration_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
+int jack_set_client_registration_callback (jack_client_t *client,
+                                            JackClientRegistrationCallback
+                                            registration_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * Tell the JACK server to call @a registration_callback whenever a
@@ -449,7 +454,7 @@ int jack_set_client_registration_callback (jack_client_t *,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
- int jack_set_port_registration_callback (jack_client_t *,
+ int jack_set_port_registration_callback (jack_client_t *client,
                                           JackPortRegistrationCallback
                                           registration_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
 
@@ -466,7 +471,7 @@ int jack_set_client_registration_callback (jack_client_t *,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_set_port_connect_callback (jack_client_t *,
+int jack_set_port_connect_callback (jack_client_t *client,
                                     JackPortConnectCallback
                                     connect_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
 
@@ -483,7 +488,7 @@ int jack_set_port_connect_callback (jack_client_t *,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_set_port_rename_callback (jack_client_t *,
+int jack_set_port_rename_callback (jack_client_t *client,
                                    JackPortRenameCallback
                                    rename_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
 
@@ -500,7 +505,7 @@ int jack_set_port_rename_callback (jack_client_t *,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_set_graph_order_callback (jack_client_t *,
+int jack_set_graph_order_callback (jack_client_t *client,
                                    JackGraphOrderCallback graph_callback,
                                    void *) JACK_OPTIONAL_WEAK_EXPORT;
 
@@ -517,7 +522,7 @@ int jack_set_graph_order_callback (jack_client_t *,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_set_xrun_callback (jack_client_t *,
+int jack_set_xrun_callback (jack_client_t *client,
                             JackXRunCallback xrun_callback, void *arg) JACK_OPTIONAL_WEAK_EXPORT;
 
 /*@}*/
@@ -575,7 +580,7 @@ int jack_set_xrun_callback (jack_client_t *,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_set_latency_callback (jack_client_t *,
+int jack_set_latency_callback (jack_client_t *client,
 			       JackLatencyCallback latency_callback,
 			       void *) JACK_WEAK_EXPORT;
 /*@}*/
@@ -713,7 +718,7 @@ jack_port_t * jack_port_register (jack_client_t *client,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_port_unregister (jack_client_t *, jack_port_t *) JACK_OPTIONAL_WEAK_EXPORT;
+int jack_port_unregister (jack_client_t *client, jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * This returns a pointer to the memory area associated with the
@@ -734,7 +739,7 @@ int jack_port_unregister (jack_client_t *, jack_port_t *) JACK_OPTIONAL_WEAK_EXP
  * Caching output ports is DEPRECATED in Jack 2.0, due to some new optimization (like "pipelining").
  * Port buffers have to be retrieved in each callback for proper functionning.
  */
-void * jack_port_get_buffer (jack_port_t *, jack_nframes_t) JACK_OPTIONAL_WEAK_EXPORT;
+void * jack_port_get_buffer (jack_port_t *port, jack_nframes_t) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * @return the full name of the jack_port_t (including the @a
@@ -771,7 +776,7 @@ jack_port_type_id_t jack_port_type_id (const jack_port_t *port) JACK_OPTIONAL_WE
 /**
  * @return TRUE if the jack_port_t belongs to the jack_client_t.
  */
-int jack_port_is_mine (const jack_client_t *, const jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
+int jack_port_is_mine (const jack_client_t *client, const jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * @return number of connections to or from @a port.
@@ -931,7 +936,7 @@ int jack_port_monitoring_input (jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
  * @return 0 on success, EEXIST if the connection is already made,
  * otherwise a non-zero error code
  */
-int jack_connect (jack_client_t *,
+int jack_connect (jack_client_t *client,
                   const char *source_port,
                   const char *destination_port) JACK_OPTIONAL_WEAK_EXPORT;
 
@@ -948,7 +953,7 @@ int jack_connect (jack_client_t *,
  *
  * @return 0 on success, otherwise a non-zero error code
  */
-int jack_disconnect (jack_client_t *,
+int jack_disconnect (jack_client_t *client,
                      const char *source_port,
                      const char *destination_port) JACK_OPTIONAL_WEAK_EXPORT;
 
@@ -961,7 +966,7 @@ int jack_disconnect (jack_client_t *,
  * while generic connection clients (e.g. patchbays) would use
  * jack_disconnect().
  */
-int jack_port_disconnect (jack_client_t *, jack_port_t *) JACK_OPTIONAL_WEAK_EXPORT;
+int jack_port_disconnect (jack_client_t *client, jack_port_t *port) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * @return the maximum number of characters in a full JACK port name
@@ -1052,7 +1057,7 @@ size_t jack_port_type_get_buffer_size (jack_client_t *client, const char *port_t
  * be replaced by a latency callback that calls @ref
  * jack_port_set_latency_range().
  */
-void jack_port_set_latency (jack_port_t *, jack_nframes_t) JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT;
+void jack_port_set_latency (jack_port_t *port, jack_nframes_t) JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT;
 
 /**
  * return the latency range defined by @a mode for
@@ -1147,7 +1152,7 @@ void jack_port_set_latency_range (jack_port_t *port, jack_latency_callback_mode_
  * @return zero for successful execution of the request. non-zero
  *         otherwise.
  */
-int jack_recompute_total_latencies (jack_client_t*) JACK_OPTIONAL_WEAK_EXPORT;
+int jack_recompute_total_latencies (jack_client_t *client) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * @return the time (in frames) between data being available or
@@ -1176,7 +1181,7 @@ jack_nframes_t jack_port_get_latency (jack_port_t *port) JACK_OPTIONAL_WEAK_DEPR
  * be replaced by jack_port_get_latency_range() in any existing
  * use cases.
  */
-jack_nframes_t jack_port_get_total_latency (jack_client_t *,
+jack_nframes_t jack_port_get_total_latency (jack_client_t *client,
 					    jack_port_t *port) JACK_OPTIONAL_WEAK_DEPRECATED_EXPORT;
 
 /**
@@ -1220,7 +1225,7 @@ int jack_recompute_total_latency (jack_client_t*, jack_port_t* port) JACK_OPTION
  *
  * @see jack_port_name_size(), jack_port_type_size()
  */
-const char ** jack_get_ports (jack_client_t *,
+const char ** jack_get_ports (jack_client_t *client,
                               const char *port_name_pattern,
                               const char *type_name_pattern,
                               unsigned long flags) JACK_OPTIONAL_WEAK_EXPORT;
@@ -1230,7 +1235,7 @@ const char ** jack_get_ports (jack_client_t *,
  *
  * @see jack_port_name_size()
  */
-jack_port_t * jack_port_by_name (jack_client_t *, const char *port_name) JACK_OPTIONAL_WEAK_EXPORT;
+jack_port_t * jack_port_by_name (jack_client_t *client, const char *port_name) JACK_OPTIONAL_WEAK_EXPORT;
 
 /**
  * @return address of the jack_port_t of a @a port_id.

common/jack/net.h

@@ -44,10 +44,10 @@ enum JackNetEncoder {
 
 typedef struct {
 
-    int audio_input;    // from master or to slave (-1 for get master audio physical outputs)
-    int audio_output;   // to master or from slave (-1 for get master audio physical inputs)
-    int midi_input;     // from master or to slave (-1 for get master MIDI physical outputs)
-    int midi_output;    // to master or from slave (-1 for get master MIDI physical inputs)
+    int audio_input;    // from master or to slave (-1 to take master audio physical inputs)
+    int audio_output;   // to master or from slave (-1 to take master audio physical outputs)
+    int midi_input;     // from master or to slave (-1 to take master MIDI physical inputs)
+    int midi_output;    // to master or from slave (-1 to take master MIDI physical outputs)
     int mtu;            // network Maximum Transmission Unit
     int time_out;       // in second, -1 means in infinite
     int encoder;        // encoder type (one of JackNetEncoder)
@@ -58,10 +58,10 @@ typedef struct {
 
 typedef struct {
 
-    int audio_input;                    // master audio physical outputs
-    int audio_output;                   // master audio physical inputs
-    int midi_input;                     // master MIDI physical outputs
-    int midi_output;                    // master MIDI physical inputs
+    int audio_input;                    // master audio physical outputs (-1 to take slave wanted audio inputs)
+    int audio_output;                   // master audio physical inputs (-1 to take slave wanted audio outputs)
+    int midi_input;                     // master MIDI physical outputs (-1 to take slave wanted MIDI inputs)
+    int midi_output;                    // master MIDI physical inputs (-1 to take slave wanted MIDI outputs)
     jack_nframes_t buffer_size;         // mater buffer size
     jack_nframes_t sample_rate;         // mater sample rate
     char master_name[MASTER_NAME_SIZE]; // master machine name

common/jack/systemdeps.h

@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2004-2009 Grame
+Copyright (C) 2004-2012 Grame
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,66 +20,104 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #ifndef __jack_systemdeps_h__
 #define __jack_systemdeps_h__
 
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(GNU_WIN32)
+#ifndef POST_PACKED_STRUCTURE
+
+    #ifdef __GNUC__
+        /* POST_PACKED_STRUCTURE needs to be a macro which
+           expands into a compiler directive. The directive must
+           tell the compiler to arrange the preceding structure
+           declaration so that it is packed on byte-boundaries rather 
+           than use the natural alignment of the processor and/or
+           compiler.
+        */
+
+        #define PRE_PACKED_STRUCTURE
+        #define POST_PACKED_STRUCTURE __attribute__((__packed__))
+
+    #else
+    
+        #ifdef _MSC_VER
+            #define PRE_PACKED_STRUCTURE1 __pragma(pack(push,1))
+            #define PRE_PACKED_STRUCTURE    PRE_PACKED_STRUCTURE1
+            /* PRE_PACKED_STRUCTURE needs to be a macro which
+            expands into a compiler directive. The directive must
+            tell the compiler to arrange the following structure
+            declaration so that it is packed on byte-boundaries rather
+            than use the natural alignment of the processor and/or
+            compiler.
+            */
+            #define POST_PACKED_STRUCTURE ;__pragma(pack(pop))
+            /* and POST_PACKED_STRUCTURE needs to be a macro which
+            restores the packing to its previous setting */
+        #else
+            #define PRE_PACKED_STRUCTURE
+            #define POST_PACKED_STRUCTURE
+        #endif
 
-#include <windows.h>
-
-#ifdef _MSC_VER     /* Microsoft compiler */
-    #define __inline__ inline
-    #if (!defined(int8_t) && !defined(_STDINT_H))
-        #define __int8_t_defined
-        typedef char int8_t;
-        typedef unsigned char uint8_t;
-        typedef short int16_t;
-        typedef unsigned short uint16_t;
-        typedef long int32_t;
-        typedef unsigned long uint32_t;
-        typedef LONGLONG int64_t;
-        typedef ULONGLONG uint64_t;
     #endif
-#elif __MINGW32__   /* MINGW */
-    #include <stdint.h>
-    #include <sys/types.h>
-#else               /* other compilers ...*/
-    #include <inttypes.h>
-    #include <pthread.h>
-    #include <sys/types.h>
+
 #endif
 
-#if !defined(_PTHREAD_H) && !defined(PTHREAD_WIN32)
-    /**
-     *  to make jack API independent of different thread implementations,
-     *  we define jack_native_thread_t to HANDLE here.
-     */
-    typedef HANDLE jack_native_thread_t;
-#else
-    #ifdef PTHREAD_WIN32            // Added by JE - 10-10-2011
-        #include <ptw32/pthread.h>  // Makes sure we #include the ptw32 version !
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(GNU_WIN32)
+
+    #include <windows.h>
+
+    #ifdef _MSC_VER     /* Microsoft compiler */
+        #define __inline__ inline
+        #if (!defined(int8_t) && !defined(_STDINT_H))
+            #define __int8_t_defined
+            typedef char int8_t;
+            typedef unsigned char uint8_t;
+            typedef short int16_t;
+            typedef unsigned short uint16_t;
+            typedef long int32_t;
+            typedef unsigned long uint32_t;
+            typedef LONGLONG int64_t;
+            typedef ULONGLONG uint64_t;
+        #endif
+    #elif __MINGW32__   /* MINGW */
+        #include <stdint.h>
+        #include <sys/types.h>
+    #else               /* other compilers ...*/
+        #include <inttypes.h>
+        #include <pthread.h>
+        #include <sys/types.h>
+    #endif
+
+    #if !defined(_PTHREAD_H) && !defined(PTHREAD_WIN32)
+        /**
+         *  to make jack API independent of different thread implementations,
+         *  we define jack_native_thread_t to HANDLE here.
+         */
+        typedef HANDLE jack_native_thread_t;
+    #else
+        #ifdef PTHREAD_WIN32            // Added by JE - 10-10-2011
+            #include <ptw32/pthread.h>  // Makes sure we #include the ptw32 version !
+        #endif
+        /**
+         *  to make jack API independent of different thread implementations,
+         *  we define jack_native_thread_t to pthread_t here.
+         */
+        typedef pthread_t jack_native_thread_t;
     #endif
-    /**
-     *  to make jack API independent of different thread implementations,
-     *  we define jack_native_thread_t to pthread_t here.
-     */
-    typedef pthread_t jack_native_thread_t;
-#endif
 
 #endif // WIN32 && !__CYGWIN__ && !GNU_WIN32 */
 
 #if defined(__APPLE__) || defined(__linux__) || defined(__sun__) || defined(sun) || defined(__unix__) || defined(__CYGWIN__) || defined(GNU_WIN32)
 
-#if defined(__CYGWIN__) || defined(GNU_WIN32)
-    #include <stdint.h>
-#endif
-    #include <inttypes.h>
-    #include <pthread.h>
-    #include <sys/types.h>
+    #if defined(__CYGWIN__) || defined(GNU_WIN32)
+        #include <stdint.h>
+    #endif
+        #include <inttypes.h>
+        #include <pthread.h>
+        #include <sys/types.h>
 
-    /**
-     *  to make jack API independent of different thread implementations,
-     *  we define jack_native_thread_t to pthread_t here.
-     */
-    typedef pthread_t jack_native_thread_t;
+        /**
+         *  to make jack API independent of different thread implementations,
+         *  we define jack_native_thread_t to pthread_t here.
+         */
+        typedef pthread_t jack_native_thread_t;
 
-#endif /* __APPLE__ || __linux__ || __sun__ || sun */
+    #endif /* __APPLE__ || __linux__ || __sun__ || sun */
 
 #endif

common/jack/types.h

@@ -259,6 +259,7 @@ typedef void (*JackLatencyCallback)(jack_latency_callback_mode_t mode, void *arg
 /**
  * the new latency API operates on Ranges.
  */
+PRE_PACKED_STRUCTURE
 struct _jack_latency_range
 {
     /**
@@ -269,7 +270,7 @@ struct _jack_latency_range
      * maximum latency
      */
     jack_nframes_t max;
-};
+} POST_PACKED_STRUCTURE;
 
 typedef struct _jack_latency_range jack_latency_range_t;
 
@@ -548,7 +549,8 @@ typedef enum {
 #define JACK_POSITION_MASK (JackPositionBBT|JackPositionTimecode)
 #define EXTENDED_TIME_INFO
 
-typedef struct {
+PRE_PACKED_STRUCTURE
+struct _jack_position {
 
     /* these four cannot be set from clients: the server sets them */
     jack_unique_t       unique_1;       /**< unique ID */
@@ -614,7 +616,9 @@ typedef struct {
     /* When (unique_1 == unique_2) the contents are consistent. */
     jack_unique_t       unique_2;       /**< unique ID */
 
-} jack_position_t;
+} POST_PACKED_STRUCTURE;
+
+typedef struct _jack_position jack_position_t;
 
 /**
     * Prototype for the @a sync_callback defined by slow-sync clients.

common/shm.h

@@ -117,20 +117,17 @@ extern "C"
      */
 
     PRE_PACKED_STRUCTURE
-    typedef struct _jack_shm_info {
+    struct _jack_shm_info {
         jack_shm_registry_index_t index;       /* offset into the registry */
         uint32_t size;
         union {
             void *attached_at;  /* address where attached */
             char ptr_size[8];
         } ptr;  /* a "pointer" that has the same 8 bytes size when compling in 32 or 64 bits */
-    }
-#ifdef _MSC_VER
-    jack_shm_info_t; POST_PACKED_STRUCTURE
-#else
-    POST_PACKED_STRUCTURE jack_shm_info_t;
-#endif
-
+    } POST_PACKED_STRUCTURE;
+    
+    typedef struct _jack_shm_info jack_shm_info_t;
+    
 	/* utility functions used only within JACK */
 
     void jack_shm_copy_from_registry (jack_shm_info_t*,

common/wscript

@@ -204,6 +204,7 @@ def build(bld):
             'JackLibSampleRateResampler.cpp',
             'JackResampler.cpp',
             'JackGlobals.cpp',
+            '../posix/JackPosixMutex.cpp',
             'ringbuffer.c']
 
         if bld.env['IS_LINUX']:

example-clients/connect.c

@@ -128,7 +128,10 @@ main (int argc, char *argv[])
 		return 1;
 	}
 
-	if (argc < 3) show_usage(my_name);
+	if (argc < 3) {
+		show_usage(my_name);
+		return 1;
+	}
 
 	/* try to become a client of the JACK server */
 

example-clients/netmaster.c

@@ -26,6 +26,7 @@
 #include <signal.h>
 #include <getopt.h>
 #include <string.h>
+#include <assert.h>
 
 #include <jack/net.h>
 
@@ -99,7 +100,8 @@ main (int argc, char *argv[])
 	}
 
     int i;
-    jack_master_t request = { -1, -1, -1, -1, buffer_size, sample_rate, "master" };
+    jack_master_t request = { 4, 4, -1, -1, buffer_size, sample_rate, "master" };
+    //jack_master_t request = { -1, -1, -1, -1, buffer_size, sample_rate, "master" };
     jack_slave_t result;
     float** audio_input_buffer;
     float** audio_output_buffer;
@@ -127,6 +129,7 @@ main (int argc, char *argv[])
 #endif
 
     // Allocate buffers
+    
     audio_input_buffer = (float**)calloc(result.audio_input, sizeof(float*));
     for (i = 0; i < result.audio_input; i++) {
         audio_input_buffer[i] = (float*)calloc(buffer_size, sizeof(float));
@@ -147,6 +150,7 @@ main (int argc, char *argv[])
   	while (1) {
 
         // Copy input to output
+        assert(result.audio_input == result.audio_output);
         for (i = 0; i < result.audio_input; i++) {
             memcpy(audio_output_buffer[i], audio_input_buffer[i], buffer_size * sizeof(float));
         }

example-clients/server_control.cpp

@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
     const JSList * drivers;
     const JSList * internals;
     const JSList * node_ptr;
-    sigset_t signals;
+    jackctl_sigmask_t * sigmask;
     int opt, option_index;
     const char* driver_name = "dummy";
     const char* client_name = "audioadapter";
@@ -234,8 +234,8 @@ int main(int argc, char *argv[])
 
     */
 
-    signals = jackctl_setup_signals(0);
-    jackctl_wait_signals(signals);
+    sigmask = jackctl_setup_signals(0);
+    jackctl_wait_signals(sigmask);
     jackctl_server_stop(server);
     jackctl_server_close(server);
     jackctl_server_destroy(server);

linux/firewire/JackFFADODriver.cpp

@@ -3,6 +3,7 @@ Copyright (C) 2001 Paul Davis
 Copyright (C) 2004 Grame
 Copyright (C) 2007 Pieter Palmers
 Copyright (C) 2009 Devin Anderson
+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
 
 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
@@ -48,7 +49,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 namespace Jack
 {
 
+// Basic functionality requires API version 8.  If version 9 or later
+// is present the buffers can be resized at runtime.
 #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
 
 #define jack_get_microseconds GetMicroSeconds
 
@@ -253,22 +257,96 @@ JackFFADODriver::ffado_driver_restart (ffado_driver_t *driver)
     return Start();
 }
 
+void
+JackFFADODriver::UpdateLatencies(void)
+{
+    jack_latency_range_t range;
+    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
+
+    for (int i = 0; i < fCaptureChannels; i++) {
+        range.min = range.max = driver->period_size + driver->capture_frame_latency;
+        fGraphManager->GetPort(fCapturePortList[i])->SetLatencyRange(JackCaptureLatency, &range);
+    }
+
+    for (int i = 0; i < fPlaybackChannels; i++) {
+        // Add one buffer more latency if "async" mode is used...
+        range.min = range.max = (driver->period_size *
+			(driver->device_options.nb_buffers - 1)) +
+                         ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency;
+        fGraphManager->GetPort(fPlaybackPortList[i])->SetLatencyRange(JackPlaybackLatency, &range);
+        // Monitor port
+        if (fWithMonitorPorts) {
+            range.min = range.max =driver->period_size;
+            fGraphManager->GetPort(fMonitorPortList[i])->SetLatencyRange(JackCaptureLatency, &range);
+        }
+    }
+}
+
 int
 JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
 {
-    printError("Buffer size change requested but not supported!!!");
+    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
+    signed int chn;
+
+    // The speed of this function isn't critical; we can afford the
+    // time to check the FFADO API version.
+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
+		    ffado_streaming_set_period_size == NULL) {
+	    printError("unsupported on current version of FFADO; please upgrade FFADO");
+	    return -1;
+    }
 
-    /*
     driver->period_size = nframes;
     driver->period_usecs =
             (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
                                  * 1000000.0f);
-    */
+
+
+    // Reallocate the null and scratch buffers.
+    driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
+    if(driver->nullbuffer == NULL) {
+	    printError("could not allocate memory for null buffer");
+	    return -1;
+    }
+    driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
+    if(driver->scratchbuffer == NULL) {
+	    printError("could not allocate memory for scratch buffer");
+	    return -1;
+    }
+
+    // MIDI buffers need reallocating
+    for (chn = 0; chn < driver->capture_nchannels; chn++) {
+	    if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
+		    // setup the midi buffer
+		    if (driver->capture_channels[chn].midi_buffer != NULL)
+			    free(driver->capture_channels[chn].midi_buffer);
+		    driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
+	    }
+    }
+    for (chn = 0; chn < driver->playback_nchannels; chn++) {
+	    if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
+		    if (driver->playback_channels[chn].midi_buffer != NULL)
+			    free(driver->playback_channels[chn].midi_buffer);
+		    driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
+	    }
+    }
+
+    // Notify FFADO of the period size change
+    if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
+	    printError("could not alter FFADO device period size");
+	    return -1;
+    }
+
+    // This is needed to give the shadow variables a chance to
+    // properly update to the changes.
+    sleep(1);
 
     /* tell the engine to change its buffer size */
-    //driver->engine->set_buffer_size (driver->engine, nframes);
+    JackAudioDriver::SetBufferSize(nframes);  // Generic change, never fails
+
+    UpdateLatencies();
 
-    return -1; // unsupported
+    return 0;
 }
 
 typedef void (*JackDriverFinishFunction) (jack_driver_t *);
@@ -281,7 +359,7 @@ JackFFADODriver::ffado_driver_new (const char *name,
 
     assert(params);
 
-    if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
         printError("Incompatible libffado version! (%s)", ffado_get_version());
         return NULL;
     }
@@ -349,7 +427,6 @@ int JackFFADODriver::Attach()
     jack_port_id_t port_index;
     char buf[REAL_JACK_PORT_NAME_SIZE];
     char portname[REAL_JACK_PORT_NAME_SIZE];
-    jack_latency_range_t range;
 
     ffado_driver_t* driver = (ffado_driver_t*)fDriver;
 
@@ -435,8 +512,6 @@ int JackFFADODriver::Attach()
             ffado_streaming_capture_stream_onoff(driver->dev, chn, 0);
 
             port = fGraphManager->GetPort(port_index);
-            range.min = range.max = driver->period_size + driver->capture_frame_latency;
-            port->SetLatencyRange(JackCaptureLatency, &range);
             // capture port aliases (jackd1 style port names)
             snprintf(buf, sizeof(buf), "%s:capture_%i", fClientControl.fName, (int) chn + 1);
             port->SetAlias(buf);
@@ -466,9 +541,6 @@ int JackFFADODriver::Attach()
             // setup the midi buffer
             driver->capture_channels[chn].midi_buffer = (uint32_t *)calloc(driver->period_size, sizeof(uint32_t));
 
-            port = fGraphManager->GetPort(port_index);
-            range.min = range.max = driver->period_size + driver->capture_frame_latency;
-            port->SetLatencyRange(JackCaptureLatency, &range);
             fCapturePortList[chn] = port_index;
             jack_log("JackFFADODriver::Attach fCapturePortList[i] %ld ", port_index);
             fCaptureChannels++;
@@ -512,8 +584,6 @@ int JackFFADODriver::Attach()
 
             port = fGraphManager->GetPort(port_index);
             // Add one buffer more latency if "async" mode is used...
-            range.min = range.max = (driver->period_size * (driver->device_options.nb_buffers - 1)) + ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency;
-            port->SetLatencyRange(JackPlaybackLatency, &range);
             // playback port aliases (jackd1 style port names)
             snprintf(buf, sizeof(buf), "%s:playback_%i", fClientControl.fName, (int) chn + 1);
             port->SetAlias(buf);
@@ -548,9 +618,6 @@ int JackFFADODriver::Attach()
 
             driver->playback_channels[chn].midi_buffer = (uint32_t *)calloc(driver->period_size, sizeof(uint32_t));
 
-            port = fGraphManager->GetPort(port_index);
-            range.min = range.max = (driver->period_size * (driver->device_options.nb_buffers - 1)) + ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency;
-            port->SetLatencyRange(JackPlaybackLatency, &range);
             fPlaybackPortList[chn] = port_index;
             jack_log("JackFFADODriver::Attach fPlaybackPortList[i] %ld ", port_index);
             fPlaybackChannels++;
@@ -559,6 +626,8 @@ int JackFFADODriver::Attach()
         }
     }
 
+    UpdateLatencies();
+
     assert(fCaptureChannels < DRIVER_PORT_NUM);
     assert(fPlaybackChannels < DRIVER_PORT_NUM);
 

linux/firewire/JackFFADODriver.h

@@ -2,6 +2,7 @@
 Copyright (C) 2001 Paul Davis
 Copyright (C) 2004 Grame
 Copyright (C) 2007 Pieter Palmers
+Copyright (C) 2012 Adrian Knoth
 
 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
@@ -59,6 +60,7 @@ class JackFFADODriver : public JackAudioDriver
 
         void jack_driver_init (jack_driver_t *driver);
         void jack_driver_nt_init (jack_driver_nt_t * driver);
+        void UpdateLatencies();
 
     public:
 
@@ -80,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
         int Read();
         int Write();
 
+        // BufferSize can be changed
+        bool IsFixedBufferSize()
+        {
+            return false;
+        }
+
         int SetBufferSize(jack_nframes_t nframes);
 };
 

macosx/JackCompilerDeps_os.h

@@ -34,11 +34,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
         than use the natural alignment of the processor and/or
         compiler.
         */
-        #if defined(JACK_32_64)
-            #define POST_PACKED_STRUCTURE __attribute__((__packed__))
-        #else
-            #define POST_PACKED_STRUCTURE
-        #endif
+        #define POST_PACKED_STRUCTURE __attribute__((__packed__))
     #endif
     #define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
     #define LIB_EXPORT __attribute__((visibility("default")))

macosx/Jackdmp.xcodeproj/project.pbxproj

@@ -878,6 +878,10 @@
 		4BA7BE240DC2350D00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
 		4BA7BE270DC2352A00AA3457 /* Jackservermp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B35C4FC0D4731D1000DE7AE /* Jackservermp.framework */; };
 		4BA7FECA0D8E76650017FF73 /* control.c in Sources */ = {isa = PBXBuildFile; fileRef = 4BA7FEC80D8E76650017FF73 /* control.c */; };
+		4BAA150314F04FB600402512 /* JackAC3Encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAA150114F04FB600402512 /* JackAC3Encoder.cpp */; };
+		4BAA150414F04FB600402512 /* JackAC3Encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAA150214F04FB600402512 /* JackAC3Encoder.h */; };
+		4BAA150514F04FB600402512 /* JackAC3Encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAA150114F04FB600402512 /* JackAC3Encoder.cpp */; };
+		4BAA150614F04FB600402512 /* JackAC3Encoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAA150214F04FB600402512 /* JackAC3Encoder.h */; };
 		4BAB95B80B9E20B800A0C723 /* JackPortType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */; };
 		4BAB95B90B9E20B800A0C723 /* JackPortType.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAB95B70B9E20B800A0C723 /* JackPortType.h */; };
 		4BAB95BA0B9E20B800A0C723 /* JackPortType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */; };
@@ -981,6 +985,8 @@
 		4BE5FED10E725C320020B576 /* JackCoreAudioAdapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE5FECF0E725C320020B576 /* JackCoreAudioAdapter.cpp */; };
 		4BE5FED20E725C320020B576 /* JackCoreAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BE5FED00E725C320020B576 /* JackCoreAudioAdapter.h */; };
 		4BE6C6AD0A3E0A65005A203A /* test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BE6C6AC0A3E0A65005A203A /* test.cpp */; };
+		4BF1007C15135D8200B88F80 /* JackPosixMutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B327BA614B4B50400976483 /* JackPosixMutex.cpp */; };
+		4BF1007D15135D8800B88F80 /* JackPosixMutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BB4214814D2C0A700A1CAE1 /* JackPosixMutex.h */; };
 		4BF2841A0F31B4BC00B05BE3 /* JackArgParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BF284160F31B4BC00B05BE3 /* JackArgParser.cpp */; };
 		4BF2841B0F31B4BC00B05BE3 /* JackArgParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF284170F31B4BC00B05BE3 /* JackArgParser.h */; };
 		4BF3391A0F8B86DC0080FB5B /* JackCoreMidiDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF339140F8B86DC0080FB5B /* JackCoreMidiDriver.h */; };
@@ -1887,6 +1893,8 @@
 		4BA692D60CBE4CC600EAD520 /* ipunload.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ipunload.c; path = "../example-clients/ipunload.c"; sourceTree = SOURCE_ROOT; };
 		4BA7FEC30D8E76270017FF73 /* jack_server_control */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = jack_server_control; sourceTree = BUILT_PRODUCTS_DIR; };
 		4BA7FEC80D8E76650017FF73 /* control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = control.c; path = "../example-clients/control.c"; sourceTree = SOURCE_ROOT; };
+		4BAA150114F04FB600402512 /* JackAC3Encoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JackAC3Encoder.cpp; path = ../common/JackAC3Encoder.cpp; sourceTree = SOURCE_ROOT; };
+		4BAA150214F04FB600402512 /* JackAC3Encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JackAC3Encoder.h; path = ../common/JackAC3Encoder.h; sourceTree = SOURCE_ROOT; };
 		4BAB95B60B9E20B800A0C723 /* JackPortType.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackPortType.cpp; path = ../common/JackPortType.cpp; sourceTree = SOURCE_ROOT; };
 		4BAB95B70B9E20B800A0C723 /* JackPortType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JackPortType.h; path = ../common/JackPortType.h; sourceTree = SOURCE_ROOT; };
 		4BAB95EC0B9E21A500A0C723 /* JackAudioPort.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JackAudioPort.cpp; path = ../common/JackAudioPort.cpp; sourceTree = SOURCE_ROOT; };
@@ -3238,8 +3246,8 @@
 				4B21794D13E2EEA60095B3E5 /* JackTimedDriver.cpp */,
 				4BF3390D0F8B86AF0080FB5B /* MIDI */,
 				4B19B3010E23629800DD4A82 /* Adapter */,
-				BA222AEA0DC88379001A17F4 /* Net */,
 				4BD56D8707968982006D44F9 /* Threaded */,
+				BA222AEA0DC88379001A17F4 /* Net */,
 				4BD56D8607968979006D44F9 /* Audio */,
 			);
 			name = Driver;
@@ -3353,6 +3361,8 @@
 		4BD56D8607968979006D44F9 /* Audio */ = {
 			isa = PBXGroup;
 			children = (
+				4BAA150114F04FB600402512 /* JackAC3Encoder.cpp */,
+				4BAA150214F04FB600402512 /* JackAC3Encoder.h */,
 				4BBB00CF0E72614F0018AB1B /* JackPortAudioDevices.cpp */,
 				4BBB00D00E72614F0018AB1B /* JackPortAudioDevices.h */,
 				4BBB00D10E72614F0018AB1B /* JackPortAudioDriver.cpp */,
@@ -3843,6 +3853,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BA4ADB50E87AB2600F26C85 /* JackCoreAudioDriver.h in Headers */,
+				4BAA150614F04FB600402512 /* JackAC3Encoder.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4277,6 +4288,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BE5FECE0E725C090020B576 /* JackCoreAudioDriver.h in Headers */,
+				4BAA150414F04FB600402512 /* JackAC3Encoder.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4300,6 +4312,7 @@
 				4B86934E1371DEBD00D2D11B /* JackLibSampleRateResampler.h in Headers */,
 				4B49D44E14865F22003390F8 /* net.h in Headers */,
 				4B49D44F14865F22003390F8 /* session.h in Headers */,
+				4BF1007D15135D8800B88F80 /* JackPosixMutex.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7381,6 +7394,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BA4ADB40E87AB2500F26C85 /* JackCoreAudioDriver.cpp in Sources */,
+				4BAA150514F04FB600402512 /* JackAC3Encoder.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7791,6 +7805,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4BE5FECD0E725C090020B576 /* JackCoreAudioDriver.cpp in Sources */,
+				4BAA150314F04FB600402512 /* JackAC3Encoder.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -7819,6 +7834,7 @@
 				4B86932C1371DD9B00D2D11B /* ringbuffer.c in Sources */,
 				4B86934D1371DEBA00D2D11B /* JackLibSampleRateResampler.cpp in Sources */,
 				4B327BD614B4B6E700976483 /* JackException.cpp in Sources */,
+				4BF1007C15135D8200B88F80 /* JackPosixMutex.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -9117,10 +9133,8 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-DHAVE_CELT",
 					"-DHAVE_CELT_API_0_7",
 					"-DMACH_RPC_MACH_SEMA",
@@ -9168,13 +9182,11 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DHAVE_CELT",
 					"-DHAVE_CELT_API_0_7",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					libcelt.a,
@@ -9510,12 +9522,10 @@
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
 					"-D__SMP__",
-					"-DJACK_32_64",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
 					"-D__SMP__",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -9566,12 +9576,10 @@
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
 					"-D__SMP__",
-					"-DJACK_32_64",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
 					"-D__SMP__",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -9617,12 +9625,10 @@
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
 					"-D__SMP__",
-					"-DJACK_32_64",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
 					"-D__SMP__",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -9685,13 +9691,11 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
 					"-D__SMP__",
-					"-DJACK_32_64",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
 				);
@@ -9751,12 +9755,10 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
@@ -9807,12 +9809,10 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
@@ -9872,7 +9872,6 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DUSE_POSIX_SHM",
 				);
@@ -9880,7 +9879,6 @@
 					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DMACH_RPC_MACH_SEMA",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
@@ -9942,7 +9940,6 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = (
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DUSE_POSIX_SHM",
 				);
@@ -9950,7 +9947,6 @@
 					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DMACH_RPC_MACH_SEMA",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
@@ -10003,12 +9999,10 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-D__SMP__",
-					"-DJACK_32_64",
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__SMP__",
-					"-DJACK_32_64",
 					"-DMACH_RPC_MACH_SEMA",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
@@ -11791,13 +11785,13 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
+					libaften_static.a,
+					libaften_pcm.a,
 					"-framework",
 					Jackservermp,
 					"-framework",
@@ -11844,13 +11838,13 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
+					libaften_pcm.a,
+					libaften_static.a,
 					"-framework",
 					Jackservermp,
 					"-framework",
@@ -11983,11 +11977,7 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
-				OTHER_CPLUSPLUSFLAGS = (
-					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
-				);
+				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
 					libportaudio.a,
 					"-framework",
@@ -12082,11 +12072,9 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -12134,11 +12122,9 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -12264,7 +12250,6 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -12364,7 +12349,6 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = All;
@@ -13485,11 +13469,9 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -13587,14 +13569,12 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__CLIENTDEBUG__",
 					"-DMACH_RPC_MACH_SEMA",
 					"-D__SMP__",
-					"-DJACK_32_64",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
 				);
@@ -13654,13 +13634,11 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__CLIENTDEBUG__",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
@@ -13711,12 +13689,10 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
@@ -16071,6 +16047,8 @@
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
+					libaften_static.a,
+					libaften_pcm.a,
 					"-framework",
 					Jackservermp,
 					"-framework",
@@ -16123,6 +16101,8 @@
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "-DMACH_RPC_MACH_SEMA";
 				OTHER_LDFLAGS = (
+					libaften_static.a,
+					libaften_pcm.a,
 					"-framework",
 					Jackservermp,
 					"-framework",
@@ -16389,14 +16369,12 @@
 				);
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DJACK_LOCATION=\\\"/usr/local/bin\\\"";
@@ -16461,14 +16439,12 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DHAVE_CELT_API_0_7",
 					"-DHAVE_CELT",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1 = "-DADDON_DIR=\\\"/usr/local/lib/jackmp\\\"";
@@ -16517,12 +16493,10 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-DUSE_POSIX_SHM",
-					"-DJACK_32_64",
 					"-D__SMP__",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
@@ -16917,7 +16891,6 @@
 				OTHER_CFLAGS = (
 					"-DJACK_MONITOR",
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DUSE_POSIX_SHM",
 				);
@@ -16926,7 +16899,6 @@
 					"-DHAVE_CELT",
 					"-DJACK_MONITOR",
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DMACH_RPC_MACH_SEMA",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
@@ -16988,7 +16960,6 @@
 				OTHER_CFLAGS = (
 					"-DJACK_MONITOR",
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DUSE_POSIX_SHM",
 				);
@@ -16997,7 +16968,6 @@
 					"-DHAVE_CELT",
 					"-DJACK_MONITOR",
 					"-DSERVER_SIDE",
-					"-DJACK_32_64",
 					"-D__SMP__",
 					"-DMACH_RPC_MACH_SEMA",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
@@ -17050,12 +17020,10 @@
 				LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.3;
 				OTHER_CFLAGS = (
 					"-D__SMP__",
-					"-DJACK_32_64",
 					"-DUSE_POSIX_SHM",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"-D__SMP__",
-					"-DJACK_32_64",
 					"-DMACH_RPC_MACH_SEMA",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_1)",
 					"$(OTHER_CPLUSPLUSFLAGS_QUOTED_FOR_TARGET_2)",
@@ -17518,7 +17486,6 @@
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -17570,7 +17537,6 @@
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -17667,7 +17633,6 @@
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -17717,7 +17682,6 @@
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
-					"-DJACK_32_64",
 				);
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -17853,7 +17817,6 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"$(OTHER_CFLAGS)",
@@ -18007,7 +17970,6 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DSERVER_SIDE",
 					"$(OTHER_CFLAGS)",
@@ -18109,9 +18071,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
-					"-DJACK_32_64",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",
@@ -18167,9 +18127,7 @@
 				LIBRARY_STYLE = DYNAMIC;
 				MACH_O_TYPE = mh_dylib;
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
-				OTHER_CFLAGS = "-DJACK_32_64";
 				OTHER_CPLUSPLUSFLAGS = (
-					"-DJACK_32_64",
 					"-DHAVE_CELT",
 					"-DSERVER_SIDE",
 					"-DMACH_RPC_MACH_SEMA",

macosx/coreaudio/JackCoreAudioDriver.cpp

@@ -27,6 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackGlobals.h"
 #include "JackTools.h"
 #include "JackLockedEngine.h"
+#include "JackAC3Encoder.h"
 
 #include <sstream>
 #include <iostream>
@@ -49,7 +50,7 @@ static void PrintStreamDesc(AudioStreamBasicDescription *inDesc)
 {
     jack_log("- - - - - - - - - - - - - - - - - - - -");
     jack_log("  Sample Rate:%f", inDesc->mSampleRate);
-    jack_log("  Format ID:%.*s", (int) sizeof(inDesc->mFormatID), (char*)&inDesc->mFormatID);
+    jack_log("  Format ID:%.*s", (int)sizeof(inDesc->mFormatID), (char*)&inDesc->mFormatID);
     jack_log("  Format Flags:%lX", inDesc->mFormatFlags);
     jack_log("  Bytes per Packet:%ld", inDesc->mBytesPerPacket);
     jack_log("  Frames per Packet:%ld", inDesc->mFramesPerPacket);
@@ -123,7 +124,7 @@ static void printError(OSStatus err)
             jack_log("error code : kAudioHardwareUnsupportedOperationError");
             break;
         default:
-            Print4CharCode("error code : unknown", err);
+            Print4CharCode("error code : unknown ", err);
             break;
     }
 }
@@ -191,7 +192,6 @@ static bool CheckAvailableDevice(AudioDeviceID device_id)
         if (device_id == devices[i]) {
             return true;
         }
-
     }
 
     return false;
@@ -323,17 +323,37 @@ int JackCoreAudioDriver::Read()
 
 int JackCoreAudioDriver::Write()
 {
-    for (int i = 0; i < fPlaybackChannels; i++) {
-        if (fGraphManager->GetConnectionsNum(fPlaybackPortList[i]) > 0) {
-            jack_default_audio_sample_t* buffer = GetOutputBuffer(i);
-            int size = sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize;
-            memcpy((jack_default_audio_sample_t*)fDriverOutputData->mBuffers[i].mData, buffer, size);
-            // Monitor ports
-            if (fWithMonitorPorts && fGraphManager->GetConnectionsNum(fMonitorPortList[i]) > 0) {
-                memcpy(GetMonitorBuffer(i), buffer, size);
+    if (fAC3Encoder) {
+    
+        // AC3 encoding and SPDIF write
+        jack_default_audio_sample_t* AC3_inputs[MAX_AC3_CHANNELS];
+        jack_default_audio_sample_t* AC3_outputs[2];
+        for (int i = 0; i < fPlaybackChannels; i++) {
+            AC3_inputs[i] = GetOutputBuffer(i);
+            // If not connected, clear the buffer
+            if (fGraphManager->GetConnectionsNum(fPlaybackPortList[i]) == 0) {
+                memset(AC3_inputs[i], 0, sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize);
+            }
+        }
+        AC3_outputs[0] = (jack_default_audio_sample_t*)fDriverOutputData->mBuffers[0].mData;
+        AC3_outputs[1] = (jack_default_audio_sample_t*)fDriverOutputData->mBuffers[1].mData;
+        fAC3Encoder->Process(AC3_inputs, AC3_outputs, fEngineControl->fBufferSize);
+        
+    } else {
+       
+        // Standard write
+        for (int i = 0; i < fPlaybackChannels; i++) {
+            if (fGraphManager->GetConnectionsNum(fPlaybackPortList[i]) > 0) {
+                jack_default_audio_sample_t* buffer = GetOutputBuffer(i);
+                int size = sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize;
+                memcpy((jack_default_audio_sample_t*)fDriverOutputData->mBuffers[i].mData, buffer, size);
+                // Monitor ports
+                if (fWithMonitorPorts && fGraphManager->GetConnectionsNum(fMonitorPortList[i]) > 0) {
+                    memcpy(GetMonitorBuffer(i), buffer, size);
+                }
+            } else {
+                memset((jack_default_audio_sample_t*)fDriverOutputData->mBuffers[i].mData, 0, sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize);
             }
-        } else {
-            memset((jack_default_audio_sample_t*)fDriverOutputData->mBuffers[i].mData, 0, sizeof(jack_default_audio_sample_t) * fEngineControl->fBufferSize);
         }
     }
     return 0;
@@ -353,7 +373,7 @@ OSStatus JackCoreAudioDriver::SRNotificationCallback(AudioDeviceID inDevice,
             jack_log("JackCoreAudioDriver::SRNotificationCallback kAudioDevicePropertyNominalSampleRate");
             // Check new sample rate
             Float64 tmp_sample_rate;
-            UInt32 outSize =  sizeof(Float64);
+            UInt32 outSize = sizeof(Float64);
             OSStatus err = AudioDeviceGetProperty(inDevice, 0, kAudioDeviceSectionGlobal, kAudioDevicePropertyNominalSampleRate, &outSize, &tmp_sample_rate);
             if (err != noErr) {
                 jack_error("Cannot get current sample rate");
@@ -371,7 +391,7 @@ OSStatus JackCoreAudioDriver::SRNotificationCallback(AudioDeviceID inDevice,
 
 OSStatus JackCoreAudioDriver::BSNotificationCallback(AudioDeviceID inDevice,
                                                      UInt32 inChannel,
-                                                     Boolean	isInput,
+                                                     Boolean isInput,
                                                      AudioDevicePropertyID inPropertyID,
                                                      void* inClientData)
 {
@@ -383,7 +403,7 @@ OSStatus JackCoreAudioDriver::BSNotificationCallback(AudioDeviceID inDevice,
             jack_log("JackCoreAudioDriver::BSNotificationCallback kAudioDevicePropertyBufferFrameSize");
             // Check new buffer size
             UInt32 tmp_buffer_size;
-            UInt32 outSize =  sizeof(UInt32);
+            UInt32 outSize = sizeof(UInt32);
             OSStatus err = AudioDeviceGetProperty(inDevice, 0, kAudioDeviceSectionGlobal, kAudioDevicePropertyBufferFrameSize, &outSize, &tmp_buffer_size);
             if (err != noErr) {
                 jack_error("Cannot get current buffer size");
@@ -406,18 +426,17 @@ OSStatus JackCoreAudioDriver::AudioHardwareNotificationCallback(AudioHardwarePro
 
     switch (inPropertyID) {
 
-            case kAudioHardwarePropertyDevices: {
-                jack_log("JackCoreAudioDriver::AudioHardwareNotificationCallback kAudioHardwarePropertyDevices");
-                DisplayDeviceNames();
-                AudioDeviceID captureID, playbackID;
-                if (CheckAvailableDevice(driver->fDeviceID) ||
-                    (CheckAvailableDeviceName(driver->fCaptureUID, &captureID)
-                    && CheckAvailableDeviceName(driver->fPlaybackUID, &playbackID))) {
+        case kAudioHardwarePropertyDevices: {
+            jack_log("JackCoreAudioDriver::AudioHardwareNotificationCallback kAudioHardwarePropertyDevices");
+            DisplayDeviceNames();
+            AudioDeviceID captureID, playbackID;
+            if (CheckAvailableDevice(driver->fDeviceID) ||
+                (CheckAvailableDeviceName(driver->fCaptureUID, &captureID)
+                && CheckAvailableDeviceName(driver->fPlaybackUID, &playbackID))) {
 
-                }
-                break;
             }
-
+            break;
+        }
     }
 
     return noErr;
@@ -461,7 +480,7 @@ OSStatus JackCoreAudioDriver::DeviceNotificationCallback(AudioDeviceID inDevice,
         }
 
         case kAudioDeviceProcessorOverload: {
-            jack_error("JackCoreAudioDriver::DeviceNotificationCallback kAudioDeviceProcessorOverload");
+            jack_error("DeviceNotificationCallback kAudioDeviceProcessorOverload");
             jack_time_t cur_time = GetMicroSeconds();
             driver->NotifyXRun(cur_time, float(cur_time - driver->fBeginDateUst));   // Better this value than nothing...
             break;
@@ -585,7 +604,7 @@ OSStatus JackCoreAudioDriver::GetDefaultInputDevice(AudioDeviceID* id)
     }
 
     if (inDefault == 0) {
-        jack_error("Error: default input device is 0, please select a correct one !!");
+        jack_error("Error default input device is 0, please select a correct one !!");
         return -1;
     }
     jack_log("JackCoreAudioDriver::GetDefaultInputDevice : input = %ld ", inDefault);
@@ -604,7 +623,7 @@ OSStatus JackCoreAudioDriver::GetDefaultOutputDevice(AudioDeviceID* id)
     }
 
     if (outDefault == 0) {
-        jack_error("Error: default output device is 0, please select a correct one !!");
+        jack_error("Error default output device is 0, please select a correct one !!");
         return -1;
     }
     jack_log("JackCoreAudioDriver::GetDefaultOutputDevice : output = %ld", outDefault);
@@ -628,12 +647,13 @@ OSStatus JackCoreAudioDriver::GetTotalChannels(AudioDeviceID device, int& channe
     err = AudioDeviceGetPropertyInfo(device, 0, isInput, kAudioDevicePropertyStreamConfiguration, &outSize, &outWritable);
     if (err == noErr) {
         int stream_count = outSize / sizeof(AudioBufferList);
+        jack_log("JackCoreAudioDriver::GetTotalChannels stream_count = %d", stream_count);
         AudioBufferList bufferList[stream_count];
         err = AudioDeviceGetProperty(device, 0, isInput, kAudioDevicePropertyStreamConfiguration, &outSize, bufferList);
         if (err == noErr) {
             for (uint i = 0; i < bufferList->mNumberBuffers; i++) {
                 channelCount += bufferList->mBuffers[i].mNumberChannels;
-                //jack_info("GetTotalChannels stream = %d channels = %d", i, bufferList->mBuffers[i].mNumberChannels);
+                jack_log("JackCoreAudioDriver::GetTotalChannels stream = %d channels = %d", i, bufferList->mBuffers[i].mNumberChannels);
             }
         }
     }
@@ -686,8 +706,77 @@ OSStatus JackCoreAudioDriver::GetStreamLatencies(AudioDeviceID device, bool isIn
     return err;
 }
 
+bool JackCoreAudioDriver::IsDigitalDevice(AudioDeviceID device)
+{
+    OSStatus err = noErr;
+    UInt32 outSize1;
+    bool is_digital = false;
+    
+    /* Get a list of all the streams on this device */
+    AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+    err = AudioObjectGetPropertyDataSize(device, &streamsAddress, 0, NULL, &outSize1);
+    if (err != noErr) {
+        jack_error("IsDigitalDevice kAudioDevicePropertyStreams err = %d", err);
+        return false;
+    }
+    
+    int stream_count = outSize1 / sizeof(AudioStreamID);
+    AudioStreamID streamIDs[stream_count];
+    
+    err = AudioObjectGetPropertyData(device, &streamsAddress, 0, NULL, &outSize1, streamIDs);
+
+    if (err != noErr) {
+        jack_error("IsDigitalDevice kAudioDevicePropertyStreams list err = %d", err);
+        return false;
+    }
+    
+    AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
+     
+    for (int i = 0; i < stream_count ; i++) {
+   
+        /* Find a stream with a cac3 stream */
+        int  format_num = 0;
+    
+        /* Retrieve all the stream formats supported by each output stream */
+        err = AudioObjectGetPropertyDataSize(streamIDs[i], &physicalFormatsAddress, 0, NULL, &outSize1);
+        
+        if (err != noErr) {
+            jack_error("IsDigitalDevice kAudioStreamPropertyAvailablePhysicalFormats err = %d", err);
+            return false;
+        }
+
+        format_num = outSize1 / sizeof(AudioStreamRangedDescription);
+        AudioStreamRangedDescription format_list[format_num];
+      
+        err = AudioObjectGetPropertyData(streamIDs[i], &physicalFormatsAddress, 0, NULL, &outSize1, format_list);
+         
+        if (err != noErr) {
+            jack_error("IsDigitalDevice could not get the list of streamformats err = %d", err);
+            return false;
+        }
+   
+        /* Check if one of the supported formats is a digital format */
+        for (int j = 0; j < format_num; j++) {
+        
+            PrintStreamDesc(&format_list[j].mFormat);
+            
+            if (format_list[j].mFormat.mFormatID == 'IAC3' ||
+                format_list[j].mFormat.mFormatID == 'iac3' ||
+                format_list[j].mFormat.mFormatID == kAudioFormat60958AC3 ||
+                format_list[j].mFormat.mFormatID == kAudioFormatAC3)
+            {
+                is_digital = true;
+                break;
+            }
+        }
+    }
+       
+    return is_digital;
+}
+
 JackCoreAudioDriver::JackCoreAudioDriver(const char* name, const char* alias, JackLockedEngine* engine, JackSynchro* table)
         : JackAudioDriver(name, alias, engine, table),
+        fAC3Encoder(NULL),
         fJackInputData(NULL),
         fDriverOutputData(NULL),
         fPluginID(0),
@@ -695,11 +784,14 @@ JackCoreAudioDriver::JackCoreAudioDriver(const char* name, const char* alias, Ja
         fHogged(false),
         fIOUsage(1.f),
         fComputationGrain(-1.f),
-        fClockDriftCompensate(false)
+        fClockDriftCompensate(false),
+        fDigitalPlayback(false)
 {}
 
 JackCoreAudioDriver::~JackCoreAudioDriver()
-{}
+{
+    delete fAC3Encoder;
+}
 
 OSStatus JackCoreAudioDriver::DestroyAggregateDevice()
 {
@@ -714,14 +806,14 @@ OSStatus JackCoreAudioDriver::DestroyAggregateDevice()
 
         osErr = AudioObjectGetPropertyDataSize(fPluginID, &pluginAOPA, 0, NULL, &outDataSize);
         if (osErr != noErr) {
-            jack_error("JackCoreAudioDriver::DestroyAggregateDevice : AudioObjectGetPropertyDataSize error");
+            jack_error("DestroyAggregateDevice : AudioObjectGetPropertyDataSize error");
             printError(osErr);
             return osErr;
         }
 
         osErr = AudioObjectGetPropertyData(fPluginID, &pluginAOPA, 0, NULL, &outDataSize, &fDeviceID);
         if (osErr != noErr) {
-            jack_error("JackCoreAudioDriver::DestroyAggregateDevice : AudioObjectGetPropertyData error");
+            jack_error("DestroyAggregateDevice : AudioObjectGetPropertyData error");
             printError(osErr);
             return osErr;
         }
@@ -793,18 +885,18 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
 
     for (UInt32 i = 0; i < captureDeviceID.size(); i++) {
         if (SetupSampleRateAux(captureDeviceID[i], samplerate) < 0) {
-            jack_error("JackCoreAudioDriver::CreateAggregateDevice : cannot set SR of input device");
+            jack_error("CreateAggregateDevice : cannot set SR of input device");
         } else  {
             // Check clock domain
             osErr = AudioDeviceGetProperty(captureDeviceID[i], 0, kAudioDeviceSectionGlobal, kAudioDevicePropertyClockDomain, &outSize, &clockdomain);
             if (osErr != 0) {
-                jack_error("JackCoreAudioDriver::CreateAggregateDevice : kAudioDevicePropertyClockDomain error");
+                jack_error("CreateAggregateDevice : kAudioDevicePropertyClockDomain error");
                 printError(osErr);
             } else {
                 keptclockdomain = (keptclockdomain == 0) ? clockdomain : keptclockdomain;
                 jack_log("JackCoreAudioDriver::CreateAggregateDevice : input clockdomain = %d", clockdomain);
                 if (clockdomain != 0 && clockdomain != keptclockdomain) {
-                    jack_error("JackCoreAudioDriver::CreateAggregateDevice : devices do not share the same clock!! clock drift compensation would be needed...");
+                    jack_error("CreateAggregateDevice : devices do not share the same clock!! clock drift compensation would be needed...");
                     need_clock_drift_compensation = true;
                 }
             }
@@ -813,18 +905,18 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
 
     for (UInt32 i = 0; i < playbackDeviceID.size(); i++) {
         if (SetupSampleRateAux(playbackDeviceID[i], samplerate) < 0) {
-            jack_error("JackCoreAudioDriver::CreateAggregateDevice : cannot set SR of output device");
+            jack_error("CreateAggregateDevice : cannot set SR of output device");
         } else {
             // Check clock domain
             osErr = AudioDeviceGetProperty(playbackDeviceID[i], 0, kAudioDeviceSectionGlobal, kAudioDevicePropertyClockDomain, &outSize, &clockdomain);
             if (osErr != 0) {
-                jack_error("JackCoreAudioDriver::CreateAggregateDevice : kAudioDevicePropertyClockDomain error");
+                jack_error("CreateAggregateDevice : kAudioDevicePropertyClockDomain error");
                 printError(osErr);
             } else {
                 keptclockdomain = (keptclockdomain == 0) ? clockdomain : keptclockdomain;
                 jack_log("JackCoreAudioDriver::CreateAggregateDevice : output clockdomain = %d", clockdomain);
                 if (clockdomain != 0 && clockdomain != keptclockdomain) {
-                    jack_error("JackCoreAudioDriver::CreateAggregateDevice : devices do not share the same clock!! clock drift compensation would be needed...");
+                    jack_error("CreateAggregateDevice : devices do not share the same clock!! clock drift compensation would be needed...");
                     need_clock_drift_compensation = true;
                 }
             }
@@ -853,7 +945,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
 
     osErr = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyPlugInForBundleID, &outSize, &outWritable);
     if (osErr != noErr) {
-        jack_error("JackCoreAudioDriver::CreateAggregateDevice : AudioHardwareGetPropertyInfo kAudioHardwarePropertyPlugInForBundleID error");
+        jack_error("CreateAggregateDevice : AudioHardwareGetPropertyInfo kAudioHardwarePropertyPlugInForBundleID error");
         printError(osErr);
         return osErr;
     }
@@ -869,7 +961,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
 
     osErr = AudioHardwareGetProperty(kAudioHardwarePropertyPlugInForBundleID, &outSize, &pluginAVT);
     if (osErr != noErr) {
-        jack_error("JackCoreAudioDriver::CreateAggregateDevice : AudioHardwareGetProperty kAudioHardwarePropertyPlugInForBundleID error");
+        jack_error("CreateAggregateDevice : AudioHardwareGetProperty kAudioHardwarePropertyPlugInForBundleID error");
         printError(osErr);
         return osErr;
     }
@@ -986,14 +1078,14 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
 
     osErr = AudioObjectGetPropertyDataSize(fPluginID, &pluginAOPA, 0, NULL, &outDataSize);
     if (osErr != noErr) {
-        jack_error("JackCoreAudioDriver::CreateAggregateDevice : AudioObjectGetPropertyDataSize error");
+        jack_error("CreateAggregateDevice : AudioObjectGetPropertyDataSize error");
         printError(osErr);
         goto error;
     }
 
     osErr = AudioObjectGetPropertyData(fPluginID, &pluginAOPA, sizeof(aggDeviceDict), &aggDeviceDict, &outDataSize, outAggregateDevice);
     if (osErr != noErr) {
-        jack_error("JackCoreAudioDriver::CreateAggregateDevice : AudioObjectGetPropertyData error");
+        jack_error("CreateAggregateDevice : AudioObjectGetPropertyData error");
         printError(osErr);
         goto error;
     }
@@ -1012,7 +1104,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
     outDataSize = sizeof(CFMutableArrayRef);
     osErr = AudioObjectSetPropertyData(*outAggregateDevice, &pluginAOPA, 0, NULL, outDataSize, &subDevicesArray);
     if (osErr != noErr) {
-        jack_error("JackCoreAudioDriver::CreateAggregateDevice : AudioObjectSetPropertyData for sub-device list error");
+        jack_error("CreateAggregateDevice : AudioObjectSetPropertyData for sub-device list error");
         printError(osErr);
         goto error;
     }
@@ -1032,7 +1124,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
     outDataSize = sizeof(CFStringRef);
     osErr = AudioObjectSetPropertyData(*outAggregateDevice, &pluginAOPA, 0, NULL, outDataSize, &captureDeviceUID[0]);  // First apture is master...
     if (osErr != noErr) {
-        jack_error("JackCoreAudioDriver::CreateAggregateDevice : AudioObjectSetPropertyData for master device error");
+        jack_error("CreateAggregateDevice : AudioObjectSetPropertyData for master device error");
         printError(osErr);
         goto error;
     }
@@ -1050,7 +1142,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
             // Get the property data size
             osErr = AudioObjectGetPropertyDataSize(*outAggregateDevice, &theAddressOwned, theQualifierDataSize, theQualifierData, &outSize);
             if (osErr != noErr) {
-                jack_error("JackCoreAudioDriver::CreateAggregateDevice kAudioObjectPropertyOwnedObjects error");
+                jack_error("CreateAggregateDevice kAudioObjectPropertyOwnedObjects error");
                 printError(osErr);
             }
 
@@ -1062,7 +1154,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
 
             osErr = AudioObjectGetPropertyData(*outAggregateDevice, &theAddressOwned, theQualifierDataSize, theQualifierData, &outSize, subDevices);
             if (osErr != noErr) {
-                jack_error("JackCoreAudioDriver::CreateAggregateDevice kAudioObjectPropertyOwnedObjects error");
+                jack_error("CreateAggregateDevice kAudioObjectPropertyOwnedObjects error");
                 printError(osErr);
             }
 
@@ -1071,7 +1163,7 @@ OSStatus JackCoreAudioDriver::CreateAggregateDeviceAux(vector<AudioDeviceID> cap
                 UInt32 theDriftCompensationValue = 1;
                 osErr = AudioObjectSetPropertyData(subDevices[index], &theAddressDrift, 0, NULL, sizeof(UInt32), &theDriftCompensationValue);
                 if (osErr != noErr) {
-                    jack_error("JackCoreAudioDriver::CreateAggregateDevice kAudioSubDevicePropertyDriftCompensation error");
+                    jack_error("CreateAggregateDevice kAudioSubDevicePropertyDriftCompensation error");
                     printError(osErr);
                 }
             }
@@ -1119,7 +1211,8 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid,
                                       const char* playback_driver_uid,
                                       char* capture_driver_name,
                                       char* playback_driver_name,
-                                      jack_nframes_t samplerate)
+                                      jack_nframes_t samplerate,
+                                      bool ac3_encoding)
 {
     capture_driver_name[0] = 0;
     playback_driver_name[0] = 0;
@@ -1142,12 +1235,22 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid,
                 jack_error("Cannot get device name from device ID");
                 return -1;
             }
+            
+            if (fHogged) {
+                if (!TakeHogAux(fDeviceID, false)) {
+                    jack_error("Cannot take hog mode");
+                } 
+                if (ac3_encoding) {
+                    fDigitalPlayback = IsDigitalDevice(fDeviceID);
+                }
+            }
 
         } else {
 
             // Creates aggregate device
-            AudioDeviceID captureID, playbackID;
-
+            AudioDeviceID captureID = -1;
+            AudioDeviceID playbackID = -1;
+    
             if (GetDeviceIDFromUID(capture_driver_uid, &captureID) != noErr) {
                 jack_log("JackCoreAudioDriver::SetupDevices : will take default input");
                 if (GetDefaultInputDevice(&captureID) != noErr) {
@@ -1170,7 +1273,20 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid,
 
             GetDeviceNameFromID(captureID, fCaptureUID);
             GetDeviceNameFromID(playbackID, fPlaybackUID);
-         }
+            
+            if (fHogged) {
+                if (!TakeHogAux(captureID, true)) {
+                    jack_error("Cannot take hog mode for capture device");
+                }
+                if (!TakeHogAux(playbackID, false)) {
+                    jack_error("Cannot take hog mode for playback device");
+                }
+                if (ac3_encoding) {
+                    fDigitalPlayback = IsDigitalDevice(playbackID);
+                }
+            }
+            
+        }
 
     // Capture only
     } else if (strcmp(capture_driver_uid, "") != 0) {
@@ -1186,6 +1302,12 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid,
             jack_error("Cannot get device name from device ID");
             return -1;
         }
+        
+        if (fHogged) {
+            if (!TakeHogAux(fDeviceID, true)) {
+                jack_error("Cannot take hog mode for capture device");
+            }
+        }
 
     // Playback only
     } else if (strcmp(playback_driver_uid, "") != 0) {
@@ -1201,6 +1323,15 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid,
             jack_error("Cannot get device name from device ID");
             return -1;
         }
+        
+        if (fHogged) {
+            if (!TakeHogAux(fDeviceID, false)) {
+                jack_error("Cannot take hog mode for playback device");
+            }
+            if (ac3_encoding) {
+                fDigitalPlayback = IsDigitalDevice(fDeviceID);
+            }
+        }
 
     // Use default driver in duplex mode
     } else {
@@ -1209,8 +1340,9 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid,
             jack_error("Cannot open default device in duplex mode, so aggregate default input and default output");
 
             // Creates aggregate device
-            AudioDeviceID captureID, playbackID;
-
+            AudioDeviceID captureID = -1;
+            AudioDeviceID playbackID = -1;
+            
             if (GetDeviceIDFromUID(capture_driver_uid, &captureID) != noErr) {
                 jack_log("JackCoreAudioDriver::SetupDevices : will take default input");
                 if (GetDefaultInputDevice(&captureID) != noErr) {
@@ -1233,15 +1365,21 @@ int JackCoreAudioDriver::SetupDevices(const char* capture_driver_uid,
 
             GetDeviceNameFromID(captureID, fCaptureUID);
             GetDeviceNameFromID(playbackID, fPlaybackUID);
+            
+            if (fHogged) {
+                if (!TakeHogAux(captureID, true)) {
+                    jack_error("Cannot take hog mode for capture device");
+                }
+                if (!TakeHogAux(playbackID, false)) {
+                    jack_error("Cannot take hog mode for playback device");
+                }
+                if (ac3_encoding) {
+                    fDigitalPlayback = IsDigitalDevice(playbackID);
+                }
+            }
         }
     }
-
-    if (fHogged) {
-        if (TakeHog()) {
-            jack_info("Device = %ld has been hogged", fDeviceID);
-        }
-    }
-
+     
     return 0;
 }
 
@@ -1255,7 +1393,7 @@ int JackCoreAudioDriver::SetupChannels(bool capturing, bool playing, int& inchan
     if (capturing) {
         err = GetTotalChannels(fDeviceID, in_nChannels, true);
         if (err != noErr) {
-            jack_error("JackCoreAudioDriver::SetupChannels : cannot get input channel number");
+            jack_error("SetupChannels : cannot get input channel number");
             printError(err);
             return -1;
         } else {
@@ -1335,7 +1473,7 @@ int JackCoreAudioDriver::SetupBufferSize(jack_nframes_t buffer_size)
 
         err = AudioDeviceSetProperty(fDeviceID, NULL, 0, kAudioDeviceSectionGlobal, kAudioDevicePropertyBufferFrameSize, outSize, &tmp_buffer_size);
         if (err != noErr) {
-            jack_error("JackCoreAudioDriver::SetupBufferSize : cannot set buffer size = %ld", tmp_buffer_size);
+            jack_error("SetupBufferSize : cannot set buffer size = %ld", tmp_buffer_size);
             printError(err);
             goto error;
         }
@@ -1351,7 +1489,7 @@ int JackCoreAudioDriver::SetupBufferSize(jack_nframes_t buffer_size)
         }
 
         // Check new buffer size
-        outSize =  sizeof(UInt32);
+        outSize = sizeof(UInt32);
         err = AudioDeviceGetProperty(fDeviceID, 0, kAudioDeviceSectionGlobal, kAudioDevicePropertyBufferFrameSize, &outSize, &tmp_buffer_size);
         if (err != noErr) {
             jack_error("Cannot get current buffer size");
@@ -1368,7 +1506,7 @@ int JackCoreAudioDriver::SetupBufferSize(jack_nframes_t buffer_size)
 
 error:
 
-    // Remove SR change notification
+    // Remove BS change notification
     AudioDeviceRemovePropertyListener(fDeviceID, 0, true, kAudioDevicePropertyBufferFrameSize, BSNotificationCallback);
     return -1;
 
@@ -1430,7 +1568,7 @@ int JackCoreAudioDriver::SetupSampleRateAux(AudioDeviceID inDevice, jack_nframes
         }
 
         // Check new sample rate
-        outSize =  sizeof(Float64);
+        outSize = sizeof(Float64);
         err = AudioDeviceGetProperty(inDevice, 0, kAudioDeviceSectionGlobal, kAudioDevicePropertyNominalSampleRate, &outSize, &tmp_sample_rate);
         if (err != noErr) {
             jack_error("Cannot get current sample rate");
@@ -1494,7 +1632,7 @@ int JackCoreAudioDriver::OpenAUHAL(bool capturing,
         printError(err1);
         goto error;
     }
-
+    
     // Start I/O
     if (capturing && inchannels > 0) {
         enableIO = 1;
@@ -1850,7 +1988,10 @@ int JackCoreAudioDriver::Open(jack_nframes_t buffer_size,
                               int async_output_latency,
                               int computation_grain,
                               bool hogged,
-                              bool clock_drift)
+                              bool clock_drift,
+                              bool ac3_encoding,
+                              int ac3_bitrate,
+                              bool ac3_lfe)
 {
     int in_nChannels = 0;
     int out_nChannels = 0;
@@ -1890,12 +2031,12 @@ int JackCoreAudioDriver::Open(jack_nframes_t buffer_size,
         AudioObjectPropertyAddress theAddress = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
         OSStatus osErr = AudioObjectSetPropertyData (kAudioObjectSystemObject, &theAddress, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
         if (osErr != noErr) {
-            jack_error("JackCoreAudioDriver::Open kAudioHardwarePropertyRunLoop error");
+            jack_error("Open kAudioHardwarePropertyRunLoop error");
             printError(osErr);
         }
     }
-
-    if (SetupDevices(capture_driver_uid, playback_driver_uid, capture_driver_name, playback_driver_name, sample_rate) < 0) {
+  
+    if (SetupDevices(capture_driver_uid, playback_driver_uid, capture_driver_name, playback_driver_name, sample_rate, ac3_encoding) < 0) {
         goto error;
     }
 
@@ -1911,7 +2052,7 @@ int JackCoreAudioDriver::Open(jack_nframes_t buffer_size,
         goto error;
     }
 
-    if (SetupChannels(capturing, playing, inchannels, outchannels, in_nChannels, out_nChannels, true) < 0) {
+    if (SetupChannels(capturing, playing, inchannels, outchannels, in_nChannels, out_nChannels, !ac3_encoding) < 0) {
         goto error;
     }
 
@@ -1922,6 +2063,47 @@ int JackCoreAudioDriver::Open(jack_nframes_t buffer_size,
     if (SetupSampleRate(sample_rate) < 0) {
         goto error;
     }
+    
+    if (ac3_encoding) {
+          
+        if (!fDigitalPlayback) {
+            jack_error("AC3 encoding can only be used with a digital device");
+            goto error;
+        }
+        
+        JackAC3EncoderParams params;
+        memset(&params, 0, sizeof(JackAC3EncoderParams));
+        params.bitrate = ac3_bitrate;
+        params.channels = outchannels;
+        params.sample_rate = sample_rate;
+        params.lfe = ac3_lfe;
+        fAC3Encoder = new JackAC3Encoder(params);
+        
+        if (!fAC3Encoder || !fAC3Encoder->Init(sample_rate)) {
+            jack_error("Cannot allocate or init AC3 encoder");
+            goto error;
+        }
+        
+        // Setup AC3 channel number
+        fPlaybackChannels = outchannels;
+        if (ac3_lfe) {
+            fPlaybackChannels++;
+        }
+        
+        if (fPlaybackChannels < 2 || fPlaybackChannels > 6) {
+            jack_error("AC3 encoder channels must be between 2 and 6");
+            goto error;
+        }
+        
+        // Force real output channel number to 2
+        outchannels = out_nChannels = 2;
+        
+    } else {
+        fPlaybackChannels = outchannels;
+    }
+    
+    // Core driver may have changed the in/out values
+    fCaptureChannels = inchannels;
 
     if (OpenAUHAL(capturing, playing, inchannels, outchannels, in_nChannels, out_nChannels, parsed_chan_in_list, parsed_chan_out_list, buffer_size, sample_rate) < 0) {
         goto error;
@@ -1936,10 +2118,7 @@ int JackCoreAudioDriver::Open(jack_nframes_t buffer_size,
     if (AddListeners() < 0) {
         goto error;
     }
-
-    // Core driver may have changed the in/out values
-    fCaptureChannels = inchannels;
-    fPlaybackChannels = outchannels;
+  
     return noErr;
 
 error:
@@ -2112,6 +2291,15 @@ int JackCoreAudioDriver::Attach()
             }
         }
     }
+    
+    if (fAC3Encoder) {
+        // Setup specific AC3 channels names
+        for (int i = 0; i < fPlaybackChannels; i++) {
+            fAC3Encoder->GetChannelName("coreaudio", "", alias, i);
+            port = fGraphManager->GetPort(fPlaybackPortList[i]);
+            port->SetAlias(alias);
+        }
+    }
 
     UpdateLatencies();
 
@@ -2194,6 +2382,8 @@ bool JackCoreAudioDriver::TakeHogAux(AudioDeviceID deviceID, bool isInput)
         jack_error("Cannot read hog state...");
         printError(err);
     }
+    
+    jack_log("JackCoreAudioDriver::TakeHogAux : deviceID = %d", deviceID);
 
     if (hog_pid != getpid()) {
         hog_pid = getpid();
@@ -2274,7 +2464,17 @@ extern "C"
 
         value.i  = 0;
         jack_driver_descriptor_add_parameter(desc, &filler, "monitor", 'm', JackDriverParamBool, &value, NULL, "Provide monitor ports for the output", NULL);
-
+        
+#ifndef __ppc__
+        value.i  = 0;
+        jack_driver_descriptor_add_parameter(desc, &filler, "AC3-encoding", 'a', JackDriverParamBool, &value, NULL, "AC3 multi-channels encoding", NULL);
+        
+        value.i  = 448;
+        jack_driver_descriptor_add_parameter(desc, &filler, "AC3-bitrate", 'b', JackDriverParamUInt, &value, NULL, "AC3 bitrate", NULL);
+       
+        value.i  = 0;
+        jack_driver_descriptor_add_parameter(desc, &filler, "AC3-LFE", 'f', JackDriverParamBool, &value, NULL, "AC3 LFE channel", NULL);
+#endif
         value.i  = TRUE;
         jack_driver_descriptor_add_parameter(desc, &filler, "duplex", 'D', JackDriverParamBool, &value, NULL, "Provide both capture and playback ports", NULL);
 
@@ -2330,6 +2530,9 @@ extern "C"
         int computation_grain = -1;
         bool hogged = false;
         bool clock_drift = false;
+        bool ac3_encoding = false;
+        int ac3_bitrate = 448;
+        bool ac3_lfe = false;
 
         for (node = params; node; node = jack_slist_next(node)) {
             param = (const jack_driver_param_t *) node->data;
@@ -2383,6 +2586,20 @@ extern "C"
                 case 'm':
                     monitor = param->value.i;
                     break;
+                    
+            #ifndef __ppc__            
+                case 'a':
+                    ac3_encoding = param->value.i;
+                    break;
+                     
+                case 'b':
+                    ac3_bitrate = param->value.i;
+                    break;
+                    
+                case 'f':
+                    ac3_lfe = param->value.i;
+                    break;
+            #endif
 
                 case 'r':
                     srate = param->value.ui;
@@ -2449,7 +2666,8 @@ extern "C"
                         systemic_output_latency,
                         async_output_latency,
                         computation_grain,
-                        hogged, clock_drift) == 0) {
+                        hogged, clock_drift, 
+                        ac3_encoding, ac3_bitrate, ac3_lfe) == 0) {
             return driver;
         } else {
             delete driver;

macosx/coreaudio/JackCoreAudioDriver.h

@@ -50,10 +50,14 @@ typedef	UInt8	CAAudioHardwareDeviceSectionID;
 \todo hardware monitoring
 */
 
+class JackAC3Encoder;
+
 class JackCoreAudioDriver : public JackAudioDriver
 {
 
     private:
+    
+        JackAC3Encoder* fAC3Encoder;
 
         AudioUnit fAUHAL;
 
@@ -75,8 +79,8 @@ class JackCoreAudioDriver : public JackAudioDriver
         float fIOUsage;
         float fComputationGrain;
         bool fClockDriftCompensate;
+        bool fDigitalPlayback;
    
-    
         static OSStatus Render(void *inRefCon,
                                AudioUnitRenderActionFlags *ioActionFlags,
                                const AudioTimeStamp *inTimeStamp,
@@ -122,7 +126,8 @@ class JackCoreAudioDriver : public JackAudioDriver
                          const char* playback_driver_uid,
                          char* capture_driver_name,
                          char* playback_driver_name,
-                         jack_nframes_t samplerate);
+                         jack_nframes_t samplerate,
+                         bool ac3_encoding);
 
         int SetupChannels(bool capturing,
                           bool playing,
@@ -158,6 +163,8 @@ class JackCoreAudioDriver : public JackAudioDriver
         bool TakeHog();
 
         void UpdateLatencies();
+        
+        bool IsDigitalDevice(AudioDeviceID device);
 
     public:
 
@@ -180,7 +187,10 @@ class JackCoreAudioDriver : public JackAudioDriver
                  int async_output_latency,
                  int computation_grain,
                  bool hogged,
-                 bool clock_drift);
+                 bool clock_drift,
+                 bool ac3_encoding,
+                 int ac3_bitrate, 
+                 bool ac3_lfe);
         int Close();
 
         int Attach();

macosx/iphone/freeverb.mm

@@ -66,8 +66,8 @@ struct Meta : map<const char*, const char*>
 #define max(x,y) (((x)>(y)) ? (x) : (y))
 #define min(x,y) (((x)<(y)) ? (x) : (y))
 
-inline int		lsr (int x, int n)			{ return int(((unsigned int)x) >> n); }
-inline int 		int2pow2 (int x)	{ int r=0; while ((1<<r)<x) r++; return r; }
+inline int		lsr (int x, int n)	{ return int(((unsigned int)x) >> n); }
+inline int 		int2pow2 (int x)	{ int r = 0; while ((1<<r)<x) r++; return r; }
 
 
 /******************************************************************************
@@ -579,12 +579,8 @@ class mydsp : public dsp {
 	}
 };
 
-
-
-
 mydsp	DSP;
 
-
 /******************************************************************************
 *******************************************************************************
 

macosx/iphone/iphone-faust.mm

@@ -61,7 +61,7 @@ using namespace std;
 
 struct Meta : map<const char*, const char*>
 {
-    void declare (const char* key, const char* value) { (*this)[key]=value; }
+    void declare (const char* key, const char* value) { (*this)[key] = value; }
 };
 
 //inline void *aligned_calloc(size_t nmemb, size_t size) { return (void*)((unsigned)(calloc((nmemb*size)+15,sizeof(char)))+15 & 0xfffffff0); }
@@ -191,15 +191,15 @@ public:
 		
 	// -- passive widgets
 	
-	virtual void addNumDisplay(const char* label, float* zone, int precision) 						{}
+	virtual void addNumDisplay(const char* label, float* zone, int precision)                           {}
 	virtual void addTextDisplay(const char* label, float* zone, char* names[], float min, float max) 	{}
 	virtual void addHorizontalBargraph(const char* label, float* zone, float min, float max) 			{}
-	virtual void addVerticalBargraph(const char* label, float* zone, float min, float max) 			{}
+	virtual void addVerticalBargraph(const char* label, float* zone, float min, float max)              {}
 
 	virtual void openFrameBox(const char* label)		{ openAnyBox(label); }
-	virtual void openTabBox(const char* label)		{ openAnyBox(label); }
+	virtual void openTabBox(const char* label)          { openAnyBox(label); }
 	virtual void openHorizontalBox(const char* label)	{ openAnyBox(label); }
-	virtual void openVerticalBox(const char* label)	{ openAnyBox(label); }
+	virtual void openVerticalBox(const char* label)     { openAnyBox(label); }
 	
 	virtual void closeBox() 					{ fPrefix.pop(); }
 	
@@ -2612,8 +2612,6 @@ class mydsp : public dsp{
 		}
 	}
 };
-
-
 				
 mydsp	DSP;
 

posix/JackCompilerDeps_os.h

@@ -33,14 +33,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
         than use the natural alignment of the processor and/or
         compiler.
         */
-        #if (__GNUC__< 4)  /* Does not seem to work with GCC 3.XX serie */
-            #define POST_PACKED_STRUCTURE
-        #elif defined(JACK_32_64)
-            #define POST_PACKED_STRUCTURE __attribute__((__packed__))
-        #else
-            #define POST_PACKED_STRUCTURE
-        #endif
+        #define POST_PACKED_STRUCTURE __attribute__((__packed__))
     #endif
+    
     #define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
     #define LIB_EXPORT __attribute__((visibility("default")))
     #ifdef SERVER_SIDE
@@ -52,6 +47,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     #else
         #define SERVER_EXPORT __attribute__((visibility("hidden")))
     #endif
+    
 #else
     #define MEM_ALIGN(x,y) x
     #define LIB_EXPORT

posix/JackPosixMutex.cpp

@@ -25,6 +25,18 @@
 namespace Jack
 {
 
+    JackBasePosixMutex::JackBasePosixMutex(const char* name)
+        :fOwner(0)
+    {
+        int res = pthread_mutex_init(&fMutex, NULL);
+        ThrowIf(res != 0, JackException("JackBasePosixMutex: could not init the mutex"));
+    }
+
+    JackBasePosixMutex::~JackBasePosixMutex()
+    {
+        pthread_mutex_destroy(&fMutex);
+    }
+
     bool JackBasePosixMutex::Lock()
     {
         pthread_t current_thread = pthread_self();
@@ -79,6 +91,25 @@ namespace Jack
         }
     }
 
+    JackPosixMutex::JackPosixMutex(const char* name)
+    {
+        // Use recursive mutex
+        pthread_mutexattr_t mutex_attr;
+        int res;
+        res = pthread_mutexattr_init(&mutex_attr);
+        ThrowIf(res != 0, JackException("JackBasePosixMutex: could not init the mutex attribute"));
+        res = pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+        ThrowIf(res != 0, JackException("JackBasePosixMutex: could not settype the mutex"));
+        res = pthread_mutex_init(&fMutex, &mutex_attr);
+        ThrowIf(res != 0, JackException("JackBasePosixMutex: could not init the mutex"));
+        pthread_mutexattr_destroy(&mutex_attr);
+    }
+
+    JackPosixMutex::~JackPosixMutex()
+    {
+        pthread_mutex_destroy(&fMutex);
+    }
+
     bool JackPosixMutex::Lock()
     {
         int res = pthread_mutex_lock(&fMutex);

posix/JackPosixMutex.h

@@ -45,16 +45,8 @@ class SERVER_EXPORT JackBasePosixMutex
 
     public:
 
-        JackBasePosixMutex(const char* name = NULL):fOwner(0)
-        {
-            int res = pthread_mutex_init(&fMutex, NULL);
-            ThrowIf(res != 0, JackException("JackBasePosixMutex: could not init the mutex"));
-        }
-
-        virtual ~JackBasePosixMutex()
-        {
-            pthread_mutex_destroy(&fMutex);
-        }
+        JackBasePosixMutex(const char* name = NULL);
+        virtual ~JackBasePosixMutex();
 
         bool Lock();
         bool Trylock();
@@ -70,31 +62,14 @@ class SERVER_EXPORT JackPosixMutex
 
     public:
 
-        JackPosixMutex(const char* name = NULL)
-        {
-            // Use recursive mutex
-            pthread_mutexattr_t mutex_attr;
-            int res;
-            res = pthread_mutexattr_init(&mutex_attr);
-            ThrowIf(res != 0, JackException("JackBasePosixMutex: could not init the mutex attribute"));
-            res = pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
-            ThrowIf(res != 0, JackException("JackBasePosixMutex: could not settype the mutex"));
-            res = pthread_mutex_init(&fMutex, &mutex_attr);
-            ThrowIf(res != 0, JackException("JackBasePosixMutex: could not init the mutex"));
-            pthread_mutexattr_destroy(&mutex_attr);
-        }
-
-        virtual ~JackPosixMutex()
-        {
-            pthread_mutex_destroy(&fMutex);
-        }
+        JackPosixMutex(const char* name = NULL);
+        virtual ~JackPosixMutex();
 
         bool Lock();
         bool Trylock();
         bool Unlock();
 };
 
-
 } // namespace
 
 #endif

tests/test.cpp

@@ -553,6 +553,8 @@ int main (int argc, char *argv[])
 
     client_name1 = "jack_test";
     time_to_run = 1;
+    //verbose_mode = 1;
+    //RT = 1;
     while ((opt = getopt_long (argc, argv, options, long_options, &option_index)) != EOF) {
         switch (opt) {
             case 'k':
@@ -1201,8 +1203,8 @@ int main (int argc, char *argv[])
      * (as mentionned in the doc of jack_get_ports)
      *
      */
-    free(inports);
-    free(outports);
+    jack_free(inports);
+    jack_free(outports);
 
     /**
      * Try to "reactivate" the client whereas it's already activated...
@@ -1241,7 +1243,7 @@ int main (int argc, char *argv[])
         printf("!!! ERROR !!! %i ports have been created, and %i callback reg ports have been received !\n", j, port_callback_reg);
     }
 
-    free(inports); // free array of ports (as mentionned in the doc of jack_get_ports)
+    jack_free(inports); // free array of ports (as mentionned in the doc of jack_get_ports)
 
     /**
      *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -1405,7 +1407,7 @@ int main (int argc, char *argv[])
         connexions2 = jack_port_get_all_connections(client1, jack_port_by_name(client1, inports[0]));
     }
 
-    free (inports);
+    jack_free (inports);
     if (connexions1 == NULL) {
         Log("checking jack_port_get_connections() for external client... ok\n");
     } else {
@@ -1648,7 +1650,7 @@ int main (int argc, char *argv[])
     } else {
         Log("Checking renaming of an unregistered port... ok\n");
     }
-    free (inports);
+    jack_free (inports);
 
 
     /**
@@ -1664,6 +1666,7 @@ int main (int argc, char *argv[])
     Log("Checking about latency functions...\n");
     t_error = 0;
     jack_recompute_total_latencies(client1);
+    Log("jack_recompute_total_latencies...\n");
     if ((jack_port_get_latency (output_port1) != 0) ||
             (jack_port_get_total_latency(client1, output_port1) != 0) ) {
         t_error = 1;
@@ -1753,8 +1756,8 @@ int main (int argc, char *argv[])
 
 	jack_sleep(1000);
 
-    free(inports);
-    free(outports);
+    jack_free(inports);
+    jack_free(outports);
 
     /**
      * Checking transport API.

windows/JackCompilerDeps_os.h

@@ -21,9 +21,19 @@
 #ifndef __JackCompilerDeps_WIN32__
 #define __JackCompilerDeps_WIN32__
 
+#define	LIB_EXPORT __declspec(dllexport)
+
+#ifdef SERVER_SIDE
+    #define	SERVER_EXPORT __declspec(dllexport)
+#else
+    #define	SERVER_EXPORT
+#endif
+
 #if __GNUC__
-    #define PRE_PACKED_STRUCTURE
 
+    #define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
+    
+    #define PRE_PACKED_STRUCTURE
     #ifndef POST_PACKED_STRUCTURE
         /* POST_PACKED_STRUCTURE needs to be a macro which
         expands into a compiler directive. The directive must
@@ -32,53 +42,36 @@
         than use the natural alignment of the processor and/or
         compiler.
         */
-        #if (__GNUC__< 4)  /* Does not seem to work with GCC 3.XX serie */
-            #define POST_PACKED_STRUCTURE
-        #elif defined(JACK_32_64)
-            #define POST_PACKED_STRUCTURE __attribute__((__packed__))
-        #else
-            #define POST_PACKED_STRUCTURE
-        #endif
-    #endif
-	#define MEM_ALIGN(x,y) x __attribute__((aligned(y)))
-	#define	LIB_EXPORT __declspec(dllexport)
-    #ifdef SERVER_SIDE
-        #define	SERVER_EXPORT __declspec(dllexport)
-    #else
-        #define	SERVER_EXPORT
+        #define POST_PACKED_STRUCTURE __attribute__((__packed__))
     #endif
+	
 #else
-    #define MEM_ALIGN(x,y) x
-    #define	LIB_EXPORT __declspec(dllexport)
-    #ifdef SERVER_SIDE
-        #define	SERVER_EXPORT __declspec(dllexport)
-    #else
-        #define	SERVER_EXPORT
-    #endif
 
+    #define MEM_ALIGN(x,y) x
+ 
     #ifdef _MSC_VER
-       #if defined(JACK_32_64)
-            #define PRE_PACKED_STRUCTURE1 __pragma(pack(push,1))
-            #define PRE_PACKED_STRUCTURE    PRE_PACKED_STRUCTURE1
-            /* PRE_PACKED_STRUCTURE needs to be a macro which
-            expands into a compiler directive. The directive must
-            tell the compiler to arrange the following structure
-            declaration so that it is packed on byte-boundaries rather
-            than use the natural alignment of the processor and/or
-            compiler.
-            */
-            #define POST_PACKED_STRUCTURE ;__pragma(pack(pop))
-            /* and POST_PACKED_STRUCTURE needs to be a macro which
-            restores the packing to its previous setting */
-       #else
-            #define PRE_PACKED_STRUCTURE
-            #define POST_PACKED_STRUCTURE
-        #endif
+        #define PRE_PACKED_STRUCTURE1 __pragma(pack(push,1))
+        #define PRE_PACKED_STRUCTURE    PRE_PACKED_STRUCTURE1
+        /* PRE_PACKED_STRUCTURE needs to be a macro which
+        expands into a compiler directive. The directive must
+        tell the compiler to arrange the following structure
+        declaration so that it is packed on byte-boundaries rather
+        than use the natural alignment of the processor and/or
+        compiler.
+        */
+        #define POST_PACKED_STRUCTURE ;__pragma(pack(pop))
+        /* and POST_PACKED_STRUCTURE needs to be a macro which
+        restores the packing to its previous setting */
     #else
         /* Other Windows compilers to go here */
         #define PRE_PACKED_STRUCTURE
         #define POST_PACKED_STRUCTURE
     #endif
+    
+#endif
+
+#if defined(_MSC_VER) /* Added by JE - 31-01-2012 */
+#define snprintf _snprintf
 #endif
 
 #endif

windows/JackWinMutex.cpp

@@ -31,11 +31,11 @@ namespace Jack
                 fOwner = GetCurrentThreadId();
                 return true;
             } else {
-                jack_log("JackWinMutex::Lock res = %d", res);
+                jack_log("JackBaseWinMutex::Lock res = %d", res);
                 return false;
             }
         } else {
-            jack_error("JackWinMutex::Lock mutex already locked by thread = %d", GetCurrentThreadId());
+            jack_error("JackBaseWinMutex::Lock mutex already locked by thread = %d", GetCurrentThreadId());
             return false;
         }
     }
@@ -48,11 +48,11 @@ namespace Jack
                 fOwner = GetCurrentThreadId();
                 return true;
             } else {
-                jack_log("JackWinMutex::Trylock res = %d", res);
+                jack_log("JackBaseWinMutex::Trylock res = %d", res);
                 return false;
             }
         } else {
-            jack_error("JackWinMutex::Trylock mutex already locked by thread = %d", GetCurrentThreadId());
+            jack_error("JackBaseWinMutex::Trylock mutex already locked by thread = %d", GetCurrentThreadId());
             return false;
         }
     }
@@ -65,11 +65,11 @@ namespace Jack
             if (res != 0) {
                 return true;
             } else {
-                jack_log("JackWinMutex::Unlock res = %d", res);
+                jack_log("JackBaseWinMutex::Unlock res = %d", res);
                 return false;
             }
         } else {
-            jack_error("JackWinMutex::Unlock mutex not locked by thread = %d", GetCurrentThreadId());
+            jack_error("JackBaseWinMutex::Unlock mutex not locked by thread = %d", GetCurrentThreadId());
             return false;
         }
     }
@@ -89,7 +89,7 @@ namespace Jack
         if (WAIT_OBJECT_0 == WaitForSingleObject(fMutex, 0)) {
             return true;
         } else  {
-            jack_log("JackWinProcessSync::Lock WaitForSingleObject err = %d", GetLastError());
+            jack_log("JackWinProcessSync::Trylock WaitForSingleObject err = %d", GetLastError());
             return false;
         }
     }

windows/JackWinProcessSync.cpp

@@ -54,6 +54,7 @@ void JackWinProcessSync::LockedSignalAll()
     LockedSignal();
 }
 
+/*
 void JackWinProcessSync::Wait()
 {
     if (!ReleaseMutex(fMutex)) {
@@ -64,6 +65,7 @@ void JackWinProcessSync::Wait()
         jack_error("JackWinProcessSync::Wait WaitForSingleObject err = %d", GetLastError());
     }
 }
+*/
 
 void JackWinProcessSync::LockedWait()
 {
@@ -71,26 +73,76 @@ void JackWinProcessSync::LockedWait()
 	Wait();
 }
 
+/*
 bool JackWinProcessSync::TimedWait(long usec)
 {
     if (!ReleaseMutex(fMutex)) {
         jack_error("JackWinProcessSync::TimedWait ReleaseMutex err = %d", GetLastError());
     }
-    
+
 	DWORD res = WaitForSingleObject(fEvent, usec / 1000);
     if (res != WAIT_OBJECT_0) {
         jack_error("JackWinProcessSync::TimedWait WaitForSingleObject err = %d", GetLastError());
     }
-    
+
 	return (res == WAIT_OBJECT_0);
 }
-
+*/
 bool JackWinProcessSync::LockedTimedWait(long usec)
 {
     // Does it make sense on Windows, use non-locked version for now...
     return TimedWait(usec);
 }
 
+void JackWinProcessSync::Wait()
+{
+    // In case Wait is called in a "locked" context
+    if (ReleaseMutex(fMutex)) {
+        HANDLE handles[] = { fMutex, fEvent };
+        DWORD res = WaitForMultipleObjects(2, handles, true, INFINITE);
+        if (res != WAIT_OBJECT_0) {
+            jack_error("JackWinProcessSync::Wait WaitForMultipleObjects err = %d", GetLastError());
+        }
+    // In case Wait is called in a "non-locked" context
+    } else {
+        jack_error("JackWinProcessSync::Wait ReleaseMutex err = %d", GetLastError());
+        DWORD res = WaitForSingleObject(fEvent, INFINITE);
+        if (res != WAIT_OBJECT_0) {
+            jack_error("JackWinProcessSync::Wait WaitForSingleObject err = %d", GetLastError());
+        }
+    }
+
+    if (!ResetEvent(fEvent)) {
+        jack_error("JackWinProcessSync::Wait ResetEvent err = %d", GetLastError());
+    }
+}
+
+bool JackWinProcessSync::TimedWait(long usec)
+{
+    DWORD res = 0;
+
+    // In case TimedWait is called in a "locked" context
+  	if (ReleaseMutex(fMutex)) {
+        HANDLE handles[] = { fMutex, fEvent };
+        res = WaitForMultipleObjects(2, handles, true, usec / 1000);
+        if ((res != WAIT_OBJECT_0) && (res != WAIT_TIMEOUT)) {
+            jack_error("JackWinProcessSync::TimedWait WaitForMultipleObjects err = %d", GetLastError());
+        }
+    // In case TimedWait is called in a "non-locked" context
+    } else {
+        jack_error("JackWinProcessSync::TimedWait ReleaseMutex err = %d", GetLastError());
+        res = WaitForSingleObject(fEvent, usec / 1000);
+        if (res != WAIT_OBJECT_0) {
+            jack_error("JackWinProcessSync::TimedWait WaitForSingleObject err = %d", GetLastError());
+        }
+    }
+
+	if (!ResetEvent(fEvent)) {
+        jack_error("JackWinProcessSync::TimedWait ResetEvent err = %d", GetLastError());
+    }
+
+	return (res == WAIT_OBJECT_0);
+}
 
 /*
 // Code from APPLE CAGuard.cpp : does not seem to work as expected...
@@ -106,18 +158,40 @@ void JackWinProcessSync::Wait()
     }
 }
 
+// Variant that behaves differently depending of the mutex state
+void JackWinProcessSync::Wait()
+{
+    if (ReleaseMutex(fMutex)) {
+        HANDLE handles[] = { fMutex, fEvent };
+        DWORD res = WaitForMultipleObjects(2, handles, true, INFINITE);
+        if (res != WAIT_OBJECT_0) {
+            jack_error("JackWinProcessSync::LockedWait WaitForMultipleObjects err = %d", GetLastError());
+        }
+    } else {
+        jack_error("JackWinProcessSync::Wait ReleaseMutex err = %d", GetLastError());
+        DWORD res = WaitForSingleObject(fEvent, INFINITE);
+        if (res != WAIT_OBJECT_0) {
+            jack_error("JackWinProcessSync::Wait WaitForSingleObject err = %d", GetLastError());
+        }
+    }
+
+    if (!ResetEvent(fEvent)) {
+        jack_error("JackWinProcessSync::LockedWait ResetEvent err = %d", GetLastError());
+    }
+}
+
 void JackWinProcessSync::LockedWait()
 {
     if (!ReleaseMutex(fMutex)) {
         jack_error("JackWinProcessSync::LockedWait ReleaseMutex err = %d", GetLastError());
     }
-    
+
 	HANDLE handles[] = { fMutex, fEvent };
 	DWORD res = WaitForMultipleObjects(2, handles, true, INFINITE);
 	if (res != WAIT_OBJECT_0) {
         jack_error("JackWinProcessSync::LockedWait WaitForMultipleObjects err = %d", GetLastError());
     }
-    
+
     if (!ResetEvent(fEvent)) {
         jack_error("JackWinProcessSync::LockedWait ResetEvent err = %d", GetLastError());
     }
@@ -128,12 +202,36 @@ bool JackWinProcessSync::TimedWait(long usec)
   	if (!ReleaseMutex(fMutex)) {
         jack_error("JackWinProcessSync::TimedWait ReleaseMutex err = %d", GetLastError());
     }
-    
+
 	DWORD res = WaitForSingleObject(fEvent, usec / 1000);
     if (res != WAIT_OBJECT_0) {
         jack_error("JackWinProcessSync::TimedWait WaitForSingleObject err = %d", GetLastError());
     }
-    
+
+	return (res == WAIT_OBJECT_0);
+}
+
+// Variant that behaves differently depending of the mutex state
+bool JackWinProcessSync::TimedWait(long usec)
+{
+  	if (ReleaseMutex(fMutex)) {
+        HANDLE handles[] = { fMutex, fEvent };
+        DWORD res = WaitForMultipleObjects(2, handles, true, usec / 1000);
+        if ((res != WAIT_OBJECT_0) && (res != WAIT_TIMEOUT)) {
+            jack_error("JackWinProcessSync::LockedTimedWait WaitForMultipleObjects err = %d", GetLastError());
+        }
+    } else {
+        jack_error("JackWinProcessSync::TimedWait ReleaseMutex err = %d", GetLastError());
+        DWORD res = WaitForSingleObject(fEvent, usec / 1000);
+        if (res != WAIT_OBJECT_0) {
+            jack_error("JackWinProcessSync::TimedWait WaitForSingleObject err = %d", GetLastError());
+        }
+    }
+
+	if (!ResetEvent(fEvent)) {
+        jack_error("JackWinProcessSync::LockedTimedWait ResetEvent err = %d", GetLastError());
+    }
+
 	return (res == WAIT_OBJECT_0);
 }
 
@@ -142,17 +240,17 @@ bool JackWinProcessSync::LockedTimedWait(long usec)
    if (!ReleaseMutex(fMutex)) {
         jack_error("JackWinProcessSync::LockedTimedWait ReleaseMutex err = %d", GetLastError());
     }
-    
+
 	HANDLE handles[] = { fMutex, fEvent };
 	DWORD res = WaitForMultipleObjects(2, handles, true, usec / 1000);
 	if ((res != WAIT_OBJECT_0) && (res != WAIT_TIMEOUT)) {
         jack_error("JackWinProcessSync::LockedTimedWait WaitForMultipleObjects err = %d", GetLastError());
     }
-        
+
     if (!ResetEvent(fEvent)) {
         jack_error("JackWinProcessSync::LockedTimedWait ResetEvent err = %d", GetLastError());
     }
-    
+
     return (res == WAIT_OBJECT_0);
 }
 */

windows/JackWinProcessSync.h

@@ -26,7 +26,7 @@ namespace Jack
 {
 
 /*!
-\brief  A synchronization primitive built using a condition variable.
+\brief A synchronization primitive built using a condition variable.
 */
 
 class JackWinProcessSync : public JackWinMutex
@@ -43,10 +43,11 @@ class JackWinProcessSync : public JackWinMutex
             if (name) {
                 char buffer[MAX_PATH];
                 snprintf(buffer, sizeof(buffer), "%s_%s", "JackWinProcessSync", name);
-                //fEvent = CreateEvent(NULL, TRUE, FALSE, buffer);  // Needs ResetEvent
-                fEvent = CreateEvent(NULL, FALSE, FALSE, buffer);   // Auto-reset event
+                fEvent = CreateEvent(NULL, TRUE, FALSE, buffer);  // Needs ResetEvent
+                //fEvent = CreateEvent(NULL, FALSE, FALSE, buffer);   // Auto-reset event
             } else {
-                fEvent = CreateEvent(NULL, FALSE, FALSE, NULL);   // Auto-reset event
+                fEvent = CreateEvent(NULL, TRUE, FALSE, NULL);   // Needs ResetEvent
+                //fEvent = CreateEvent(NULL, FALSE, FALSE, NULL);   // Auto-reset event
             }
 
             ThrowIf((fEvent == 0), JackException("JackWinProcessSync: could not init the event"));

windows/Setup/jack.ci

@@ -79,13 +79,13 @@
 <_><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>..\Release\bin\jack_midi_dump.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\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\net.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</></>
@@ -104,6 +104,7 @@
 <_><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</></>
 

windows/Setup/jack64.ci

@@ -68,7 +68,8 @@
 <_><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>..\Release\bin\libjackserver.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release\bin\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</></>
@@ -93,7 +94,6 @@
 <_><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\net.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</></>
@@ -116,6 +116,7 @@
 <_><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</></>
 

windows/Setup/src/README

@@ -49,9 +49,14 @@ 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]: 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].
-
-	- [AUTO_CONNECT] : when 1, the application JACK port will automatically be connected to the machine input/output JACK ports.
+	- [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.
 
 
 =============================================

windows/jack_audioadapter.cbp

@@ -17,7 +17,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -43,7 +42,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -53,6 +51,8 @@
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
 					<Add library="libsamplerate_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug64\bin" />
 				</Linker>
 			</Target>
@@ -68,7 +68,6 @@
 					<Add option="-D__SMP__" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -78,6 +77,8 @@
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
 					<Add library="libsamplerate_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
@@ -93,7 +94,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -124,7 +124,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-D__SMP__" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -135,6 +134,8 @@
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
 					<Add library="libsamplerate_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug\bin" />
 				</Linker>
 				<ExtraCommands>
@@ -154,7 +155,6 @@
 					<Add option="-D__SMP__" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -165,6 +165,8 @@
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
 					<Add library="libsamplerate_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release\bin" />
 				</Linker>
 				<ExtraCommands>

windows/jack_connect.dsp

@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_connect" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_connect - 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 "jack_connect.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 "jack_connect.mak" CFG="jack_connect - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_connect - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_connect - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_connect - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../common/" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /machine:I386 /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_connect - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /debug /machine:I386 /out:"./Debug/bin/jack_connect.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_connect - Win32 Release"
-# Name "jack_connect - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\example-clients\connect.c"
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_dummy.cbp

@@ -16,7 +16,6 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -36,7 +35,6 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -57,7 +55,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -78,7 +75,6 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -103,7 +99,6 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -129,7 +124,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />

windows/jack_freeverb.dsp

@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_freeverb" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_freeverb - 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 "jack_freeverb.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 "jack_freeverb.mak" CFG="jack_freeverb - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_freeverb - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_freeverb - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_freeverb - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jack_freeverb.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_freeverb - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../common" /I "." /I "../common/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Debug/bin/jack_freeverb.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_freeverb - Win32 Release"
-# Name "jack_freeverb - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\example-clients\freeverb.cpp"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_load.dsp

@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_load" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_load - 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 "jack_load.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 "jack_load.mak" CFG="jack_load - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_load - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_load - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_load - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "jack_load___Win32_Release"
-# PROP BASE Intermediate_Dir "jack_load___Win32_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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /I "../common/jack" /I "../example-clients" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jack_load.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_load - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "jack_load___Win32_Debug"
-# PROP BASE Intermediate_Dir "jack_load___Win32_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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /I "../example-clients" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Debug/bin/jack_load.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_load - Win32 Release"
-# Name "jack_load - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\example-clients\ipload.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_loopback.cbp

@@ -16,8 +16,7 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -36,8 +35,7 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+              			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -57,8 +55,7 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+             			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -75,11 +72,10 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
+                   			 <Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                 			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -100,11 +96,10 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-                    <Add option="-m32" />
+                			<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+              				<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -125,12 +120,11 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
+                 			<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>

windows/jack_lsp.dsp

@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_lsp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_lsp - 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 "jack_lsp.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 "jack_lsp.mak" CFG="jack_lsp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_lsp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_lsp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_lsp - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jack_lsp.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_lsp - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Debug/bin/jack_lsp.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_lsp - Win32 Release"
-# Name "jack_lsp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\example-clients\lsp.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_metro.dsp

@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_metro" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_metro - 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 "jack_metro.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 "jack_metro.mak" CFG="jack_metro - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_metro - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_metro - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_metro - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jack_metro.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_metro - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Debug/bin/jack_metro.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_metro - Win32 Release"
-# Name "jack_metro - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE="..\example-clients\metro.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_netadapter.cbp

@@ -16,8 +16,7 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                   			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -37,8 +36,7 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                   			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -59,8 +57,7 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                 			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -81,8 +78,7 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                  			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -107,8 +103,7 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -134,8 +129,7 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+               				<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>

windows/jack_netdriver.cbp

@@ -16,7 +16,6 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -36,7 +35,6 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -57,7 +55,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -78,7 +75,6 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -103,7 +99,6 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -129,7 +124,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />

windows/jack_netdriver.dsp

@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_netdriver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=jack_netdriver - 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 "jack_netdriver.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 "jack_netdriver.mak" CFG="jack_netdriver - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_netdriver - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "jack_netdriver - 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)" == "jack_netdriver - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "jack_netdriver___Win32_Release"
-# PROP BASE Intermediate_Dir "jack_netdriver___Win32_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 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETDRIVER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETDRIVER_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 /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 libjackservermp.lib ws2_32.lib /nologo /dll /machine:I386 /out:"./Release/bin/jackmp/jack_net.dll" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_netdriver - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "jack_netdriver___Win32_Debug"
-# PROP BASE Intermediate_Dir "jack_netdriver___Win32_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 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETDRIVER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETDRIVER_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 /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 libjackservermp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"./Debug/bin/jackmp/jack_net.dll" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_netdriver - Win32 Release"
-# Name "jack_netdriver - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\JackNetDriver.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_netmanager.cbp

@@ -15,8 +15,7 @@
 					<Add option="-O2" />
 					<Add option="-Wall" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                   			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -34,8 +33,7 @@
 					<Add option="-Wall" />
 					<Add option="-g" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -54,8 +52,7 @@
 					<Add option="-Wall" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+              			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -72,10 +69,9 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
+                    			<Add option="-m32" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                 			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -96,10 +92,9 @@
 				<Compiler>
 					<Add option="-Wall" />
 					<Add option="-g" />
-                    <Add option="-m32" />
+                   			 <Add option="-m32" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                 			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>
@@ -120,11 +115,10 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
+                    			<Add option="-m32" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="..\windows" />
+                 			<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
 				</Compiler>

windows/jack_netmanager.dsp

@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_netmanager" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=jack_netmanager - 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 "jack_netmanager.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 "jack_netmanager.mak" CFG="jack_netmanager - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_netmanager - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "jack_netmanager - 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)" == "jack_netmanager - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "jack_netmanager___Win32_Release"
-# PROP BASE Intermediate_Dir "jack_netmanager___Win32_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 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETMANAGER_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETMANAGER_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 /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 libjackservermp.lib ws2_32.lib /nologo /dll /machine:I386 /out:"./Release/bin/jackmp/netmanager.dll" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_netmanager - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "jack_netmanager___Win32_Debug"
-# PROP BASE Intermediate_Dir "jack_netmanager___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "./Deubg"
-# PROP Intermediate_Dir "./Debug"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETMANAGER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_NETMANAGER_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 /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 libjackservermp.lib ws2_32.lib /nologo /dll /debug /machine:I386 /out:"./Debug/bin/jackmp/netmanager.dll" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_netmanager - Win32 Release"
-# Name "jack_netmanager - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\JackNetManager.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_netonedriver.cbp

@@ -16,7 +16,6 @@
 					<Add option="-Wall" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -36,7 +35,6 @@
 					<Add option="-g" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -57,7 +55,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -78,7 +75,6 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -103,7 +99,6 @@
 					<Add option="-m32" />
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -129,7 +124,6 @@
 					<Add option="-DBUILD_DLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />

windows/jack_portaudio.cbp

@@ -21,7 +21,6 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -43,8 +42,8 @@
 				<Option type="3" />
 				<Option compiler="mingw_64" />
 				<Compiler>
-					<Add option="-W" />
 					<Add option="-g" />
+					<Add option="-W" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_CONSOLE" />
@@ -52,7 +51,6 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -62,6 +60,8 @@
 				<Linker>
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug64\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -82,7 +82,6 @@
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -92,6 +91,8 @@
 				<Linker>
 					<Add library="libjackserver64" />
 					<Add library="libportaudio_x86_64.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release64\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -112,7 +113,6 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -138,8 +138,8 @@
 				<Option type="3" />
 				<Option compiler="mingw_64" />
 				<Compiler>
-					<Add option="-W" />
 					<Add option="-g" />
+					<Add option="-W" />
 					<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
@@ -148,7 +148,6 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -159,6 +158,8 @@
 					<Add option="-m32" />
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Debug\bin" />
 					<Add directory="..\windows" />
 				</Linker>
@@ -183,7 +184,6 @@
 					<Add option="-DJACK_PORTAUDIO_EXPORTS" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -194,6 +194,8 @@
 					<Add option="-m32" />
 					<Add library="libjackserver" />
 					<Add library="libportaudio_x86.a" />
+					<Add library="winmm" />
+					<Add library="ole32" />
 					<Add directory="Release\bin" />
 					<Add directory="..\windows" />
 				</Linker>

windows/jack_portaudio.dsp

@@ -1,115 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_portaudio" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=jack_portaudio - 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 "jack_portaudio.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 "jack_portaudio.mak" CFG="jack_portaudio - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_portaudio - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "jack_portaudio - 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)" == "jack_portaudio - 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 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_PORTAUDIO_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_PORTAUDIO_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 /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 portaudio_x86.lib libjackservermp.lib /nologo /dll /machine:I386 /out:"./Release/bin/jackmp/jack_portaudio.dll" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_portaudio - 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 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_PORTAUDIO_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JACK_PORTAUDIO_EXPORTS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 /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 portaudio_x86.lib libjackservermp.lib /nologo /dll /debug /machine:I386 /out:"./Debug/bin/jackmp/jack_portaudio_debug.dll" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_portaudio - Win32 Release"
-# Name "jack_portaudio - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\JackPortAudioDevices.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackPortAudioDriver.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"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_simple_client.dsp

@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_simple_client" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_simple_client - 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 "jack_simple_client.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 "jack_simple_client.mak" CFG="jack_simple_client - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_simple_client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_simple_client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_simple_client - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jack_simple_client.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_simple_client - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../common/" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Debug/bin/jack_simple_client.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_simple_client - Win32 Release"
-# Name "jack_simple_client - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\example-clients\simple_client.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_test.dsp

@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_test - 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 "jack_test.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 "jack_test.mak" CFG="jack_test - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_test - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common/" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jack_test.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_test - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common/" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Debug/bin/jack_test.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_test - Win32 Release"
-# Name "jack_test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\tests\jack_test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_unload.cbp

@@ -25,7 +25,7 @@
 			</Target>
 			<Target title="Win32 Debug 64bits">
 				<Option output="Debug64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
-				<Option object_output="Debug\64" />
+				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
 				<Compiler>

windows/jack_unload.dsp

@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jack_unload" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jack_unload - 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 "jack_unload.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 "jack_unload.mak" CFG="jack_unload - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jack_unload - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jack_unload - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jack_unload - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "jack_unload___Win32_Release"
-# PROP BASE Intermediate_Dir "jack_unload___Win32_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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /I "../common/jack" /I "../example-clients" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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  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:console /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  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jack_unload.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jack_unload - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "jack_unload___Win32_Debug"
-# PROP BASE Intermediate_Dir "jack_unload___Win32_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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /I "../example-clients" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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  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:console /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  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Debug/bin/jack_unload.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jack_unload - Win32 Release"
-# Name "jack_unload - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\example-clients\ipunload.c"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jack_winmme.cbp

@@ -20,8 +20,7 @@
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="." />
+                			<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -47,8 +46,7 @@
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="." />
+               			<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -75,8 +73,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="." />
+             				<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -96,15 +93,14 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                     <Add option="-m32" />
+                     			<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="." />
+            				<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -128,15 +124,14 @@
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
-                    <Add option="-m32" />
+                    			<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-D_DEBUG" />
 					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
 					<Add option="-D_USRDLL" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="." />
+              			<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />
@@ -160,7 +155,7 @@
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wall" />
-                    <Add option="-m32" />
+                    			<Add option="-m32" />
 					<Add option="-DWIN32" />
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
@@ -168,8 +163,7 @@
 					<Add option="-D_USRDLL" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DSERVER_SIDE" />
-                    <Add option="-DJACK_32_64" />
-					<Add directory="." />
+              				<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
 					<Add directory="..\common" />

windows/jackaudioadapter.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp Audio Adapter for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "audioadapter\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "audioadapter.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "audioadapter\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jackd.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_APP
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jack server for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "jackd\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "jackd.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "jackd\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jackdmp.dsp

@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jackdmp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jackdmp - 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 "jackdmp.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 "jackdmp.mak" CFG="jackdmp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jackdmp - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jackdmp - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jackdmp - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackservermp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jackdmp.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jackdmp - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__STDC__" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /debug /machine:I386 /out:"./Debug/bin/jackdmp.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jackdmp - Win32 Release"
-# Name "jackdmp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\Jackdmp.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/jackdmp.dsw

@@ -1,272 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "jack_connect"=".\jack_connect.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_freeverb"=".\jack_freeverb.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_load"=".\jack_load.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_lsp"=".\jack_lsp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_metro"=".\jack_metro.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_netdriver"=".\jack_netdriver.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackservermp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_netmanager"=".\jack_netmanager.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackservermp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_portaudio"=".\jack_portaudio.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackservermp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_simple_client"=".\jack_simple_client.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_test"=".\jack_test.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jack_unload"=".\jack_unload.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jackdmp"=".\jackdmp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackservermp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "jdelay"=".\jdelay.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libjackmp
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libjackmp"=".\libjackmp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libjackservermp"=".\libjackservermp.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "testSynchoServerClient"=".\testSynchoServerClient.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "testSynchroClient"=".\testSynchroClient.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "testSynchroServer"=".\testSynchroServer.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

windows/jackdummydriver.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp Dummy Driver for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "jack_dummy\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "jack_dummy.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "jack_dummy\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jackloopbackdriver.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp Loopback Driver for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "jack_loopback\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "jack_loopback.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "jack_loopback\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jacknetadapter.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp Net Adapter for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "netadapter\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "netadapter.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "netadapter\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jacknetdriver.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp Net Driver for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "jack_netdriver\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "jack_netdriver.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "jack_netdriver\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jacknetmanager.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp Net Manager for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "netmanager\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "netmanager.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "netmanager\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jacknetonedriver.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp NetOne Driver for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "jack_netonedriver\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "jack_netonedriver.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "jack_netonedriver\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jackportaudio.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp PortAudio Driver for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "jack_portaudio\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "jack_portaudio.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "jack_portaudio\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jackwinmme.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp WinMME Driver for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "jack_portaudio\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "jack_winmme.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "jack_winmme\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/jdelay.dsp

@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="jdelay" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=jdelay - 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 "jdelay.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 "jdelay.mak" CFG="jdelay - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "jdelay - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "jdelay - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "jdelay - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../common" /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjackmp.lib /nologo /subsystem:console /machine:I386 /out:"./Release/bin/jdelay.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "jdelay - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../common" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /debug /machine:I386 /out:"./Debug/bin/jdelay.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "jdelay - Win32 Release"
-# Name "jdelay - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\tests\jdelay.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/libjack.cbp

@@ -24,7 +24,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -67,7 +66,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -110,7 +108,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
@@ -155,7 +152,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -203,7 +199,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -251,7 +246,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />

windows/libjack.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jack client library for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "libjack\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libjack.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "libjack\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/libjackmp.dsp

@@ -1,219 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libjackmp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libjackmp - 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 "libjackmp.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 "libjackmp.mak" CFG="libjackmp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libjackmp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libjackmp - 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)" == "libjackmp - 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" /D "_MBCS" /D "_USRDLL" /D "LIBJACKMP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBJACKMP_EXPORTS" /D "__STDC__" /D "REGEX_MALLOC" /D "STDC_HEADERS" /D "__SMP__" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 /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 /nologo /entry:"DllEntryPoint" /dll /machine:I386 /out:"./Release/bin/libjackmp.dll" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "libjackmp - 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" /D "_MBCS" /D "_USRDLL" /D "LIBJACKMP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBJACKMP_EXPORTS" /D "__STDC__" /D "REGEX_MALLOC" /D "STDC_HEADERS" /D "__SMP__" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 /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 /nologo /dll /debug /machine:I386 /out:"./Debug/bin/libjackmp.dll" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libjackmp - Win32 Release"
-# Name "libjackmp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\JackActivationCount.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackAPI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackAudioPort.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackConnectionManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackEngineControl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackError.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackFrameTimer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackGlobals.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackGraphManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackLibAPI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackLibClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackMessageBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackMidiAPI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackMidiPort.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackPort.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackPortType.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackShmMem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackTime.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackTools.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackTransportEngine.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinNamedPipe.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinNamedPipeClientChannel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinProcessSync.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinSemaphore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinThread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\shm.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/libjacknet.cbp

@@ -25,7 +25,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -55,7 +54,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -85,7 +83,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -117,7 +114,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -152,7 +148,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -187,7 +182,6 @@
 					<Add option="-DREGEX_MALLOC" />
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DJACK_MONITOR" />
 					<Add directory="." />
 					<Add directory="..\windows" />

windows/libjacknet.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jack Net library for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "libjacknet\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libjacknet.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "libjacknet\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/libjackserver.cbp

@@ -25,7 +25,6 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-DSERVER_SIDE" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -58,7 +57,6 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-DSERVER_SIDE" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -91,7 +89,6 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-DSERVER_SIDE" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
@@ -126,7 +123,6 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-DSERVER_SIDE" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -164,7 +160,6 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-DSERVER_SIDE" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />
 					<Add directory="..\windows" />
@@ -202,7 +197,6 @@
 					<Add option="-DSTDC_HEADERS" />
 					<Add option="-DSERVER_SIDE" />
 					<Add option="-D__SMP__" />
-					<Add option="-DJACK_32_64" />
 					<Add option="-DJACK_MONITOR" />
 					<Add option="-DHAVE_CONFIG_H" />
 					<Add directory="." />

windows/libjackserver.rc

@@ -11,8 +11,8 @@
 //
 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
 1 VERSIONINFO
-    FILEVERSION     1,9,9,0
-    PRODUCTVERSION  1,9,9,0
+    FILEVERSION     1,9,9,3
+    PRODUCTVERSION  1,9,9,3
     FILEOS          VOS_UNKNOWN
     FILETYPE        VFT_DLL
 BEGIN
@@ -23,14 +23,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jack server library for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "libjackserver\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libjackserver.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "libjackserver\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/libjackservermp.dsp

@@ -1,303 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libjackservermp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libjackservermp - 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 "libjackservermp.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 "libjackservermp.mak" CFG="libjackservermp - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libjackservermp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libjackservermp - 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)" == "libjackservermp - 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" /D "_MBCS" /D "_USRDLL" /D "LIBJACKDMP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBJACKDMP_EXPORTS" /D "__STDC__" /D "REGEX_MALLOC" /D "STDC_HEADERS" /D "__SMP__" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 /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 ws2_32.lib /nologo /entry:"DllEntryPoint" /dll /machine:I386 /out:"./Release/bin/libjackservermp.dll" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "libjackservermp - 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" /D "_MBCS" /D "_USRDLL" /D "LIBJACKDMP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBJACKDMP_EXPORTS" /D "__STDC__" /D "REGEX_MALLOC" /D "STDC_HEADERS" /D "__SMP__" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 /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 ws2_32.lib /nologo /dll /debug /machine:I386 /out:"./Debug/bin/libjackservermp.dll" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libjackservermp - Win32 Release"
-# Name "libjackservermp - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\getopt1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackActivationCount.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackAPI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackAudioDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackAudioPort.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackConnectionManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackControl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackDriverLoader.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackEngine.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackEngineControl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackError.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackExternalClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackFrameTimer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackFreewheelDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackGlobals.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackGraphManager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackInternalClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackLoopbackDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackMessageBuffer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackMidiAPI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackMidiPort.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackNetTool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackNetWinSocket.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackPort.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackPortType.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackRestartThreadedDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackServer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackServerAPI.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackServerGlobals.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackShmMem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackThreadedDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackTime.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackTools.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackTransportEngine.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\JackWaitThreadedDriver.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinNamedPipe.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinNamedPipeClientChannel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinNamedPipeNotifyChannel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinNamedPipeServerChannel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinNamedPipeServerNotifyChannel.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinProcessSync.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinSemaphore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinThread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\shm.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\common\JackMidiPort.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
-# End Target
-# End Project

windows/portaudio/JackPortAudioDevices.cpp

@@ -46,8 +46,7 @@ PortAudioDevices::PortAudioDevices()
 
 PortAudioDevices::~PortAudioDevices()
 {
-    // Desactivate for now: crash the server..
-    //Pa_Terminate();
+    Pa_Terminate();
 
     delete[] fDeviceInfo;
     delete[] fHostName;
@@ -99,19 +98,19 @@ string PortAudioDevices::GetFullName(std::string hostname, std::string devicenam
 }
 
 PaDeviceInfo* PortAudioDevices::GetDeviceFromFullName (string fullname, PaDeviceIndex& id, bool isInput)
-{
+{
     PaDeviceInfo* ret = NULL;
     //no driver to find
-    if (fullname.size() == 0) {
+    if (fullname.size() == 0) {
         return NULL;
     }
     //first get host and device names from fullname
-    string::size_type separator = fullname.find("::", 0);
+    string::size_type separator = fullname.find("::", 0);
 
-    if (separator == string::npos) {
+    if (separator == string::npos) {
         return NULL;
-    }
-
+    }
+
     char* hostname = (char*)malloc(separator + 9);
     fill_n (hostname, separator + 9, 0);
     fullname.copy (hostname, separator);

windows/resource.rc

@@ -14,8 +14,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 
 #ifndef _MAC
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,9,9,0
- PRODUCTVERSION 1,9,9,0
+ FILEVERSION 1,9,9,3
+ PRODUCTVERSION 1,9,9,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -33,14 +33,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Grame\0"
             VALUE "FileDescription", "Jackmp for Windows\0"
-            VALUE "FileVersion", "1, 9, 9, 0\0"
+            VALUE "FileVersion", "1, 9, 9, 3\0"
             VALUE "InternalName", "libjackmp\0"
-            VALUE "LegalCopyright", "Copyright Grame © 2006-2011\0"
+            VALUE "LegalCopyright", "Copyright Grame © 2006-2012\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libjackmp.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "libjackmp\0"
-            VALUE "ProductVersion", "1, 9, 9, 0\0"
+            VALUE "ProductVersion", "1, 9, 9, 3\0"
             VALUE "SpecialBuild", "\0"
         END
     END

windows/testSynchoServerClient.dsp

@@ -1,114 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testSynchoServerClient" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testSynchoServerClient - 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 "testSynchoServerClient.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 "testSynchoServerClient.mak" CFG="testSynchoServerClient - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testSynchoServerClient - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testSynchoServerClient - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testSynchoServerClient - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /machine:I386 /out:"./Release/bin/testSynchoServerClient.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "testSynchoServerClient - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /debug /machine:I386 /out:"./Debug/bin/testSynchoServerClient.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testSynchoServerClient - Win32 Release"
-# Name "testSynchoServerClient - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\JackError.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinEvent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinThread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\tests\testSynchroServerClient.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/testSynchroClient.dsp

@@ -1,150 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testSynchroClient" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testSynchroClient - 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 "testSynchroClient.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 "testSynchroClient.mak" CFG="testSynchroClient - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testSynchroClient - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testSynchroClient - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testSynchroClient - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /machine:I386 /out:"./Release/bin/testSynchroClient.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "testSynchroClient - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /debug /machine:I386 /out:"./Debug/bin/testSynchroClient.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testSynchroClient - Win32 Release"
-# Name "testSynchroClient - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\JackError.c
-
-!IF  "$(CFG)" == "testSynchroClient - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testSynchroClient - Win32 Debug"
-
-# ADD CPP /U "." /U "../common"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinEvent.cpp
-
-!IF  "$(CFG)" == "testSynchroClient - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testSynchroClient - Win32 Debug"
-
-# ADD CPP /U "." /U "../common"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinThread.cpp
-
-!IF  "$(CFG)" == "testSynchroClient - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testSynchroClient - Win32 Debug"
-
-# ADD CPP /U "." /U "../common"
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\tests\testSynchroClient.cpp
-
-!IF  "$(CFG)" == "testSynchroClient - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "testSynchroClient - Win32 Debug"
-
-# ADD CPP /U "." /U "../common"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

windows/testSynchroServer.dsp

@@ -1,114 +0,0 @@
-# Microsoft Developer Studio Project File - Name="testSynchroServer" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=testSynchroServer - 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 "testSynchroServer.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 "testSynchroServer.mak" CFG="testSynchroServer - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "testSynchroServer - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "testSynchroServer - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "testSynchroServer - 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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../common" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x40c /d "NDEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /machine:I386 /out:"./Release/bin/testSynchroServer.exe" /libpath:"./Release" /libpath:"./Release/bin"
-
-!ELSEIF  "$(CFG)" == "testSynchroServer - 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../common" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
-# ADD BASE RSC /l 0x40c /d "_DEBUG"
-# ADD RSC /l 0x40c /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 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:console /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 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:console /debug /machine:I386 /out:"./Debug/bin/testSynchroServer.exe" /pdbtype:sept /libpath:"./Debug" /libpath:"./Debug/bin"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "testSynchroServer - Win32 Release"
-# Name "testSynchroServer - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\common\JackError.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinEvent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\JackWinThread.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\tests\testSynchroServer.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

wscript

@@ -214,8 +214,6 @@ def configure(conf):
             conf.define('USE_LIBDBUS_AUTOLAUNCH', 1)
     if conf.env['BUILD_WITH_PROFILE'] == True:
         conf.define('JACK_MONITOR', 1)
-    if conf.env['BUILD_WITH_32_64'] == True:
-        conf.define('JACK_32_64', 1)
     conf.write_config_header('config.h')
 
     svnrev = None