[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-6-5-g98eae1c
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Wed May 5 12:41:05 UTC 2010
The following commit has been merged in the master branch:
commit ce99848a074485fd2a09731efdd57835d5b2780a
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Tue May 4 12:08:20 2010 +0200
Update to upstream r4003.
Upstream now contains the atomic patch, get_cycles, pointersize,
armel-varargs and more-varargs.
JFTR: http://trac.jackaudio.org/ticket/171
diff --git a/debian/patches/0000_sync_upstream_VCS.patch b/debian/patches/0000_sync_upstream_VCS.patch
index fe65291..28c29f2 100644
--- a/debian/patches/0000_sync_upstream_VCS.patch
+++ b/debian/patches/0000_sync_upstream_VCS.patch
@@ -1,9 +1,11 @@
-Description: Sync with upstream SVN trunk revision 3995
+Description: Sync with upstream SVN trunk revision 4003
From: Jonas Smedegaard <dr at jones.dk>
Forwarded: yes
-Last-Update: 2010-05-02
---- a/ChangeLog
-+++ b/ChangeLog
+Last-Update: 2010-05-04
+Index: jack-audio-connection-kit/ChangeLog
+===================================================================
+--- jack-audio-connection-kit.orig/ChangeLog 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/ChangeLog 2010-05-04 12:05:11.000000000 +0200
@@ -19,194 +19,238 @@
Florian Faber
Michael Voigt
@@ -355,8 +357,10 @@ Last-Update: 2010-05-02
* Correct ressource cleanup in case of driver open failure.
2008-11-19 Stephane Letz <letz at grame.fr>
---- a/common/JackAtomicArrayState.h
-+++ b/common/JackAtomicArrayState.h
+Index: jack-audio-connection-kit/common/JackAtomicArrayState.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackAtomicArrayState.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackAtomicArrayState.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -396,8 +400,10 @@ Last-Update: 2010-05-02
#ifndef __JackAtomicArrayState__
#define __JackAtomicArrayState__
---- a/common/JackConstants.h
-+++ b/common/JackConstants.h
+Index: jack-audio-connection-kit/common/JackConstants.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackConstants.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackConstants.h 2010-05-04 12:05:11.000000000 +0200
@@ -24,7 +24,7 @@
#include "config.h"
#endif
@@ -445,8 +451,10 @@ Last-Update: 2010-05-02
#define SOCKET_TIME_OUT 5 // in sec
#define DRIVER_OPEN_TIMEOUT 5 // in sec
---- a/common/JackControlAPI.h
-+++ b/common/JackControlAPI.h
+Index: jack-audio-connection-kit/common/JackControlAPI.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackControlAPI.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackControlAPI.h 2010-05-04 12:05:11.000000000 +0200
@@ -47,7 +47,7 @@
#define JACK_PARAM_MAX (JackParamBool + 1)
@@ -456,8 +464,10 @@ Last-Update: 2010-05-02
/** @brief Type for parameter value */
/* intentionally similar to jack_driver_param_value_t */
---- a/common/JackError.cpp
-+++ b/common/JackError.cpp
+Index: jack-audio-connection-kit/common/JackError.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackError.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackError.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,23 +1,23 @@
/*
- Copyright (C) 2001 Paul Davis
@@ -501,8 +511,10 @@ Last-Update: 2010-05-02
#include <stdarg.h>
#include <stdio.h>
---- a/common/JackError.h
-+++ b/common/JackError.h
+Index: jack-audio-connection-kit/common/JackError.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackError.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackError.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,22 +1,21 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -543,8 +555,10 @@ Last-Update: 2010-05-02
*/
---- a/common/JackGraphManager.cpp
-+++ b/common/JackGraphManager.cpp
+Index: jack-audio-connection-kit/common/JackGraphManager.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackGraphManager.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackGraphManager.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -385,7 +385,7 @@
void JackGraphManager::DeactivatePort(jack_port_id_t port_index)
{
@@ -554,8 +568,10 @@ Last-Update: 2010-05-02
}
void JackGraphManager::GetInputPorts(int refnum, jack_int_t* res)
---- a/common/JackNetTool.cpp
-+++ b/common/JackNetTool.cpp
+Index: jack-audio-connection-kit/common/JackNetTool.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackNetTool.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackNetTool.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -283,7 +283,7 @@
jack_info ( "Sample rate : %u frames per second", params->fSampleRate );
jack_info ( "Period size : %u frames per period", params->fPeriodSize );
@@ -565,8 +581,10 @@ Last-Update: 2010-05-02
jack_info ( "Bitdepth : %s", bitdepth );
jack_info ( "Slave mode : %s", ( params->fSlaveSyncMode ) ? "sync" : "async" );
jack_info ( "Network mode : %s", mode );
---- a/common/JackShmMem.cpp
-+++ b/common/JackShmMem.cpp
+Index: jack-audio-connection-kit/common/JackShmMem.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackShmMem.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackShmMem.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,22 +1,21 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -607,8 +625,10 @@ Last-Update: 2010-05-02
#include "JackError.h"
#include "JackShmMem.h"
---- a/common/JackShmMem.h
-+++ b/common/JackShmMem.h
+Index: jack-audio-connection-kit/common/JackShmMem.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackShmMem.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackShmMem.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,22 +1,21 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -649,8 +669,10 @@ Last-Update: 2010-05-02
#ifndef __JackShmMem__
#define __JackShmMem__
---- a/common/JackTools.cpp
-+++ b/common/JackTools.cpp
+Index: jack-audio-connection-kit/common/JackTools.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackTools.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackTools.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -194,7 +194,7 @@
}
@@ -678,8 +700,10 @@ Last-Update: 2010-05-02
return 0;
}
#endif
---- a/common/JackWeakAPI.cpp
-+++ b/common/JackWeakAPI.cpp
+Index: jack-audio-connection-kit/common/JackWeakAPI.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackWeakAPI.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackWeakAPI.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,33 +1,36 @@
-/*
-Copyright (C) 2009 Grame
@@ -882,8 +906,10 @@ Last-Update: 2010-05-02
+DECL_FUNCTION_NULL(jack_midi_data_t*, jack_midi_event_reserve, (void* port_buffer, jack_nframes_t time, size_t data_size), (port_buffer, time, data_size));
DECL_FUNCTION(int, jack_midi_event_write, (void* port_buffer, jack_nframes_t time, const jack_midi_data_t* data, size_t data_size), (port_buffer, time, data, data_size));
DECL_FUNCTION(jack_nframes_t, jack_midi_get_lost_event_count, (void* port_buffer), (port_buffer));
---- a/common/driver_interface.h
-+++ b/common/driver_interface.h
+Index: jack-audio-connection-kit/common/driver_interface.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/driver_interface.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/driver_interface.h 2010-05-04 12:05:11.000000000 +0200
@@ -33,7 +33,7 @@
#define JACK_DRIVER_NAME_MAX 15
@@ -893,8 +919,10 @@ Last-Update: 2010-05-02
#define JACK_DRIVER_PARAM_DESC 255
#define JACK_PATH_MAX 511
---- a/common/jack/control.h
-+++ b/common/jack/control.h
+Index: jack-audio-connection-kit/common/jack/control.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/jack/control.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/jack/control.h 2010-05-04 12:05:11.000000000 +0200
@@ -48,8 +48,8 @@
/** @brief Max value that jackctl_param_type_t type can have */
#define JACK_PARAM_MAX (JackParamBool + 1)
@@ -906,8 +934,10 @@ Last-Update: 2010-05-02
/** @brief Type for parameter value */
/* intentionally similar to jack_driver_param_value_t */
---- a/common/shm.c
-+++ b/common/shm.c
+Index: jack-audio-connection-kit/common/shm.c
+===================================================================
+--- jack-audio-connection-kit.orig/common/shm.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/shm.c 2010-05-04 12:05:11.000000000 +0200
@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2003 Paul Davis
@@ -977,8 +1007,10 @@ Last-Update: 2010-05-02
return 0;
}
---- a/dbus/controller_iface_control.c
-+++ b/dbus/controller_iface_control.c
+Index: jack-audio-connection-kit/dbus/controller_iface_control.c
+===================================================================
+--- jack-audio-connection-kit.orig/dbus/controller_iface_control.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/dbus/controller_iface_control.c 2010-05-04 12:05:11.000000000 +0200
@@ -87,34 +87,31 @@
{
if (!jack_controller_start_server(controller_ptr, call))
@@ -1026,8 +1058,10 @@ Last-Update: 2010-05-02
}
else if (strcmp (call->method_name, "GetLoad") == 0)
{
---- a/doxyfile
-+++ b/doxyfile
+Index: jack-audio-connection-kit/doxyfile
+===================================================================
+--- jack-audio-connection-kit.orig/doxyfile 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/doxyfile 2010-05-04 12:05:11.000000000 +0200
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
@@ -1037,8 +1071,10 @@ Last-Update: 2010-05-02
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
---- a/example-clients/alsa_in.c
-+++ b/example-clients/alsa_in.c
+Index: jack-audio-connection-kit/example-clients/alsa_in.c
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/alsa_in.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/alsa_in.c 2010-05-04 12:05:11.000000000 +0200
@@ -38,6 +38,8 @@
int quit = 0;
double resample_mean = 1.0;
@@ -1068,8 +1104,10 @@ Last-Update: 2010-05-02
resample_mean = static_resample_factor;
offset_array = malloc( sizeof(double) * smooth_size );
---- a/example-clients/alsa_out.c
-+++ b/example-clients/alsa_out.c
+Index: jack-audio-connection-kit/example-clients/alsa_out.c
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/alsa_out.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/alsa_out.c 2010-05-04 12:05:11.000000000 +0200
@@ -37,6 +37,8 @@
double resample_mean = 1.0;
@@ -1099,8 +1137,10 @@ Last-Update: 2010-05-02
resample_mean = static_resample_factor;
offset_array = malloc( sizeof(double) * smooth_size );
---- a/example-clients/internal_metro.cpp
-+++ b/example-clients/internal_metro.cpp
+Index: jack-audio-connection-kit/example-clients/internal_metro.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/internal_metro.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/internal_metro.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -46,7 +46,6 @@
{
sample_t scale;
@@ -1147,8 +1187,10 @@ Last-Update: 2010-05-02
+ free(amp);
+ free(wave);
}
---- a/example-clients/internal_metro.h
-+++ b/example-clients/internal_metro.h
+Index: jack-audio-connection-kit/example-clients/internal_metro.h
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/internal_metro.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/internal_metro.h 2010-05-04 12:05:11.000000000 +0200
@@ -53,6 +53,7 @@
int bpm;
jack_nframes_t tone_length, wave_length;
@@ -1157,8 +1199,10 @@ Last-Update: 2010-05-02
long offset ;
InternalMetro(int freq, double max_amp, int dur_arg, int bpm, char* client_name);
---- a/example-clients/metro.c
-+++ b/example-clients/metro.c
+Index: jack-audio-connection-kit/example-clients/metro.c
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/metro.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/metro.c 2010-05-04 12:05:11.000000000 +0200
@@ -257,7 +257,7 @@
if (jack_activate (client)) {
@@ -1178,8 +1222,10 @@ Last-Update: 2010-05-02
+ free(wave);
exit (0);
}
---- a/linux/firewire/JackFFADODriver.cpp
-+++ b/linux/firewire/JackFFADODriver.cpp
+Index: jack-audio-connection-kit/linux/firewire/JackFFADODriver.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/linux/firewire/JackFFADODriver.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/linux/firewire/JackFFADODriver.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -429,7 +429,7 @@
driver->capture_channels[chn].stream_type = ffado_streaming_get_capture_stream_type(driver->dev, chn);
@@ -1247,8 +1293,10 @@ Last-Update: 2010-05-02
break;
case 'p':
cmlparams.period_size = param->value.ui;
---- a/macosx/Jack-Info.plist
-+++ b/macosx/Jack-Info.plist
+Index: jack-audio-connection-kit/macosx/Jack-Info.plist
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/Jack-Info.plist 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/macosx/Jack-Info.plist 2010-05-04 12:05:11.000000000 +0200
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Jackservermp</string>
@@ -1266,8 +1314,10 @@ Last-Update: 2010-05-02
+ <string>1.9.6</string>
</dict>
</plist>
---- a/macosx/JackMachServerChannel.cpp
-+++ b/macosx/JackMachServerChannel.cpp
+Index: jack-audio-connection-kit/macosx/JackMachServerChannel.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/JackMachServerChannel.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/macosx/JackMachServerChannel.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -159,7 +159,7 @@
kern_return_t res;
if ((res = mach_msg_server(MessageHandler, 1024, fServerPort.GetPortSet(), 0)) != KERN_SUCCESS) {
@@ -1277,8 +1327,10 @@ Last-Update: 2010-05-02
}
return true;
---- a/macosx/Jackdmp.xcodeproj/project.pbxproj
-+++ b/macosx/Jackdmp.xcodeproj/project.pbxproj
+Index: jack-audio-connection-kit/macosx/Jackdmp.xcodeproj/project.pbxproj
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/Jackdmp.xcodeproj/project.pbxproj 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/macosx/Jackdmp.xcodeproj/project.pbxproj 2010-05-04 12:05:11.000000000 +0200
@@ -106,7 +106,6 @@
4B19B3140E2362E800DD4A82 /* JackAudioAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B19B3070E2362E700DD4A82 /* JackAudioAdapter.h */; };
4B19B3150E2362E800DD4A82 /* JackAudioAdapterInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B19B3080E2362E700DD4A82 /* JackAudioAdapterInterface.cpp */; };
@@ -1857,8 +1909,10 @@ Last-Update: 2010-05-02
OTHER_LDFLAGS = (
"-framework",
Jackmp,
---- a/macosx/coreaudio/JackCoreAudioAdapter.cpp
-+++ b/macosx/coreaudio/JackCoreAudioAdapter.cpp
+Index: jack-audio-connection-kit/macosx/coreaudio/JackCoreAudioAdapter.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/coreaudio/JackCoreAudioAdapter.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/macosx/coreaudio/JackCoreAudioAdapter.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -545,10 +545,23 @@
// Creates aggregate device
@@ -1944,8 +1998,10 @@ Last-Update: 2010-05-02
}
}
---- a/macosx/coreaudio/JackCoreAudioDriver.cpp
-+++ b/macosx/coreaudio/JackCoreAudioDriver.cpp
+Index: jack-audio-connection-kit/macosx/coreaudio/JackCoreAudioDriver.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/coreaudio/JackCoreAudioDriver.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/macosx/coreaudio/JackCoreAudioDriver.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -922,7 +922,7 @@
if (GetDeviceIDFromUID(capture_driver_uid, &captureID) != noErr) {
jack_log("Will take default input");
@@ -2046,8 +2102,10 @@ Last-Update: 2010-05-02
}
break;
---- a/posix/JackNetUnixSocket.cpp
-+++ b/posix/JackNetUnixSocket.cpp
+Index: jack-audio-connection-kit/posix/JackNetUnixSocket.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/posix/JackNetUnixSocket.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/posix/JackNetUnixSocket.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -99,6 +99,13 @@
Reset();
}
@@ -2062,8 +2120,10 @@ Last-Update: 2010-05-02
return fSockfd;
}
---- a/solaris/oss/JackBoomerDriver.cpp
-+++ b/solaris/oss/JackBoomerDriver.cpp
+Index: jack-audio-connection-kit/solaris/oss/JackBoomerDriver.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/solaris/oss/JackBoomerDriver.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/solaris/oss/JackBoomerDriver.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -985,20 +985,20 @@
case 'C':
capture = true;
@@ -2089,8 +2149,10 @@ Last-Update: 2010-05-02
break;
case 'e':
---- a/solaris/oss/JackOSSDriver.cpp
-+++ b/solaris/oss/JackOSSDriver.cpp
+Index: jack-audio-connection-kit/solaris/oss/JackOSSDriver.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/solaris/oss/JackOSSDriver.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/solaris/oss/JackOSSDriver.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -904,20 +904,20 @@
case 'C':
capture = true;
@@ -2116,8 +2178,10 @@ Last-Update: 2010-05-02
break;
case 'b':
---- a/tests/external_metro.cpp
-+++ b/tests/external_metro.cpp
+Index: jack-audio-connection-kit/tests/external_metro.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/tests/external_metro.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/tests/external_metro.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -60,7 +60,6 @@
{
sample_t scale;
@@ -2135,8 +2199,10 @@ Last-Update: 2010-05-02
}
int main (int argc, char *argv[])
---- a/tests/external_metro.h
-+++ b/tests/external_metro.h
+Index: jack-audio-connection-kit/tests/external_metro.h
+===================================================================
+--- jack-audio-connection-kit.orig/tests/external_metro.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/tests/external_metro.h 2010-05-04 12:05:11.000000000 +0200
@@ -53,6 +53,7 @@
int bpm;
jack_nframes_t tone_length, wave_length;
@@ -2145,8 +2211,10 @@ Last-Update: 2010-05-02
long offset ;
ExternalMetro(int freq, double max_amp, int dur_arg, int bpm, const char* client_name = "metro");
---- a/windows/JackCompilerDeps_os.h
-+++ b/windows/JackCompilerDeps_os.h
+Index: jack-audio-connection-kit/windows/JackCompilerDeps_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackCompilerDeps_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackCompilerDeps_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -2186,8 +2254,10 @@ Last-Update: 2010-05-02
#ifndef __JackCompilerDeps_WIN32__
#define __JackCompilerDeps_WIN32__
---- a/windows/JackNetWinSocket.cpp
-+++ b/windows/JackNetWinSocket.cpp
+Index: jack-audio-connection-kit/windows/JackNetWinSocket.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackNetWinSocket.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackNetWinSocket.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2008 Romain Moret at Grame
@@ -2227,8 +2297,10 @@ Last-Update: 2010-05-02
#include "JackNetWinSocket.h"
---- a/windows/JackNetWinSocket.h
-+++ b/windows/JackNetWinSocket.h
+Index: jack-audio-connection-kit/windows/JackNetWinSocket.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackNetWinSocket.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackNetWinSocket.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2008 Romain Moret at Grame
@@ -2268,8 +2340,10 @@ Last-Update: 2010-05-02
#ifndef __JackNetWinSocket__
#define __JackNetWinSocket__
---- a/windows/JackPlatformPlug_os.h
-+++ b/windows/JackPlatformPlug_os.h
+Index: jack-audio-connection-kit/windows/JackPlatformPlug_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackPlatformPlug_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackPlatformPlug_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,25 +1,30 @@
/*
-Copyright (C) 2004-2008 Grame
@@ -2317,8 +2391,10 @@ Last-Update: 2010-05-02
namespace Jack
{
struct JackRequest;
---- a/windows/JackShmMem_os.h
-+++ b/windows/JackShmMem_os.h
+Index: jack-audio-connection-kit/windows/JackShmMem_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackShmMem_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackShmMem_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,28 +1,28 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -2367,8 +2443,10 @@ Last-Update: 2010-05-02
// See GetProcessWorkingSetSize and SetProcessWorkingSetSize
#define CHECK_MLOCK(ptr, size) (VirtualLock((ptr), (size)) != 0)
---- a/windows/JackSystemDeps_os.h
-+++ b/windows/JackSystemDeps_os.h
+Index: jack-audio-connection-kit/windows/JackSystemDeps_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackSystemDeps_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackSystemDeps_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2408,8 +2486,10 @@ Last-Update: 2010-05-02
#ifndef __JackSystemDeps_WIN32__
#define __JackSystemDeps_WIN32__
---- a/windows/JackTypes_os.h
-+++ b/windows/JackTypes_os.h
+Index: jack-audio-connection-kit/windows/JackTypes_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackTypes_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackTypes_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
- Copyright (C) 2001 Paul Davis
@@ -2449,8 +2529,10 @@ Last-Update: 2010-05-02
#ifndef __JackTypes_WIN32__
#define __JackTypes_WIN32__
---- a/windows/JackWinEvent.cpp
-+++ b/windows/JackWinEvent.cpp
+Index: jack-audio-connection-kit/windows/JackWinEvent.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinEvent.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinEvent.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -2490,8 +2572,10 @@ Last-Update: 2010-05-02
#include "JackWinEvent.h"
#include "JackTools.h"
---- a/windows/JackWinEvent.h
-+++ b/windows/JackWinEvent.h
+Index: jack-audio-connection-kit/windows/JackWinEvent.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinEvent.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinEvent.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -2531,8 +2615,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinEvent__
#define __JackWinEvent__
---- a/windows/JackWinMutex.h
-+++ b/windows/JackWinMutex.h
+Index: jack-audio-connection-kit/windows/JackWinMutex.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinMutex.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinMutex.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,23 +1,22 @@
/*
- Copyright (C) 2006 Grame
@@ -2573,8 +2659,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinMutex__
#define __JackWinMutex__
---- a/windows/JackWinNamedPipe.cpp
-+++ b/windows/JackWinNamedPipe.cpp
+Index: jack-audio-connection-kit/windows/JackWinNamedPipe.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipe.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipe.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2614,8 +2702,10 @@ Last-Update: 2010-05-02
#include "JackWinNamedPipe.h"
#include "JackError.h"
---- a/windows/JackWinNamedPipe.h
-+++ b/windows/JackWinNamedPipe.h
+Index: jack-audio-connection-kit/windows/JackWinNamedPipe.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipe.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipe.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2655,8 +2745,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinNamedPipe__
#define __JackWinNamedPipe__
---- a/windows/JackWinNamedPipeClientChannel.cpp
-+++ b/windows/JackWinNamedPipeClientChannel.cpp
+Index: jack-audio-connection-kit/windows/JackWinNamedPipeClientChannel.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipeClientChannel.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipeClientChannel.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2696,8 +2788,10 @@ Last-Update: 2010-05-02
#include "JackWinNamedPipeClientChannel.h"
#include "JackRequest.h"
---- a/windows/JackWinNamedPipeClientChannel.h
-+++ b/windows/JackWinNamedPipeClientChannel.h
+Index: jack-audio-connection-kit/windows/JackWinNamedPipeClientChannel.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipeClientChannel.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipeClientChannel.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2737,8 +2831,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinNamedPipeClientChannel__
#define __JackWinNamedPipeClientChannel__
---- a/windows/JackWinNamedPipeNotifyChannel.cpp
-+++ b/windows/JackWinNamedPipeNotifyChannel.cpp
+Index: jack-audio-connection-kit/windows/JackWinNamedPipeNotifyChannel.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipeNotifyChannel.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipeNotifyChannel.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2778,8 +2874,10 @@ Last-Update: 2010-05-02
#include "JackRequest.h"
#include "JackWinNamedPipeNotifyChannel.h"
---- a/windows/JackWinNamedPipeNotifyChannel.h
-+++ b/windows/JackWinNamedPipeNotifyChannel.h
+Index: jack-audio-connection-kit/windows/JackWinNamedPipeNotifyChannel.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipeNotifyChannel.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipeNotifyChannel.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2819,8 +2917,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinNamedPipeNotifyChannel__
#define __JackWinNamedPipeNotifyChannel__
---- a/windows/JackWinNamedPipeServerChannel.cpp
-+++ b/windows/JackWinNamedPipeServerChannel.cpp
+Index: jack-audio-connection-kit/windows/JackWinNamedPipeServerChannel.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipeServerChannel.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipeServerChannel.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2868,8 +2968,10 @@ Last-Update: 2010-05-02
fPipe->Close();
fRefNum = -1;
}
---- a/windows/JackWinNamedPipeServerChannel.h
-+++ b/windows/JackWinNamedPipeServerChannel.h
+Index: jack-audio-connection-kit/windows/JackWinNamedPipeServerChannel.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipeServerChannel.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipeServerChannel.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2909,8 +3011,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinNamedPipeServerChannel__
#define __JackWinNamedPipeServerChannel__
---- a/windows/JackWinNamedPipeServerNotifyChannel.h
-+++ b/windows/JackWinNamedPipeServerNotifyChannel.h
+Index: jack-audio-connection-kit/windows/JackWinNamedPipeServerNotifyChannel.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinNamedPipeServerNotifyChannel.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinNamedPipeServerNotifyChannel.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2950,8 +3054,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinNamedPipeServerNotifyChannel__
#define __JackWinNamedPipeServerNotifyChannel__
---- a/windows/JackWinProcessSync.cpp
-+++ b/windows/JackWinProcessSync.cpp
+Index: jack-audio-connection-kit/windows/JackWinProcessSync.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinProcessSync.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinProcessSync.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2991,8 +3097,10 @@ Last-Update: 2010-05-02
#include "JackWinProcessSync.h"
#include "JackError.h"
---- a/windows/JackWinProcessSync.h
-+++ b/windows/JackWinProcessSync.h
+Index: jack-audio-connection-kit/windows/JackWinProcessSync.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinProcessSync.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinProcessSync.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -3032,8 +3140,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinProcessSync__
#define __JackWinProcessSync__
---- a/windows/JackWinSemaphore.cpp
-+++ b/windows/JackWinSemaphore.cpp
+Index: jack-audio-connection-kit/windows/JackWinSemaphore.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinSemaphore.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinSemaphore.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -3073,8 +3183,10 @@ Last-Update: 2010-05-02
#include "JackWinSemaphore.h"
#include "JackConstants.h"
---- a/windows/JackWinSemaphore.h
-+++ b/windows/JackWinSemaphore.h
+Index: jack-audio-connection-kit/windows/JackWinSemaphore.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinSemaphore.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinSemaphore.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -3114,8 +3226,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinSemaphore__
#define __JackWinSemaphore__
---- a/windows/JackWinThread.cpp
-+++ b/windows/JackWinThread.cpp
+Index: jack-audio-connection-kit/windows/JackWinThread.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinThread.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinThread.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -1,22 +1,22 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -3156,8 +3270,10 @@ Last-Update: 2010-05-02
#include "JackWinThread.h"
#include "JackError.h"
---- a/windows/JackWinThread.h
-+++ b/windows/JackWinThread.h
+Index: jack-audio-connection-kit/windows/JackWinThread.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinThread.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinThread.h 2010-05-04 12:05:11.000000000 +0200
@@ -1,22 +1,22 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -3198,8 +3314,10 @@ Last-Update: 2010-05-02
#ifndef __JackWinThread__
---- a/windows/JackWinTime.c
-+++ b/windows/JackWinTime.c
+Index: jack-audio-connection-kit/windows/JackWinTime.c
+===================================================================
+--- jack-audio-connection-kit.orig/windows/JackWinTime.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/JackWinTime.c 2010-05-04 12:05:11.000000000 +0200
@@ -1,22 +1,22 @@
/*
-Copyright (C) 2001-2003 Paul Davis
@@ -3240,8 +3358,10 @@ Last-Update: 2010-05-02
#include "JackTime.h"
---- a/windows/README
-+++ b/windows/README
+Index: jack-audio-connection-kit/windows/README
+===================================================================
+--- jack-audio-connection-kit.orig/windows/README 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/README 2010-05-04 12:05:11.000000000 +0200
@@ -1,32 +1,35 @@
-------------------------------
-Jackmp on Windows
@@ -3318,8 +3438,10 @@ Last-Update: 2010-05-02
For any question or suggestion, you can refer to the mailing list 'jack-devel at jackaudio.org'
-Enjoy Jack on windows... ;-)
+Enjoy JACK on windows... ;-)
---- a/windows/Setup/jack.ci
-+++ b/windows/Setup/jack.ci
+Index: jack-audio-connection-kit/windows/Setup/jack.ci
+===================================================================
+--- jack-audio-connection-kit.orig/windows/Setup/jack.ci 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/Setup/jack.ci 2010-05-04 12:05:11.000000000 +0200
@@ -1,9 +1,9 @@
<*project
version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" >
@@ -3341,8 +3463,10 @@ Last-Update: 2010-05-02
<_><src>.\JackRouter.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\JackRouter.ini</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
<_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
---- a/windows/jackaudioadapter.rc
-+++ b/windows/jackaudioadapter.rc
+Index: jack-audio-connection-kit/windows/jackaudioadapter.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jackaudioadapter.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jackaudioadapter.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3372,8 +3496,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/jackd.rc
-+++ b/windows/jackd.rc
+Index: jack-audio-connection-kit/windows/jackd.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jackd.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jackd.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3403,8 +3529,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/jackd.workspace
-+++ b/windows/jackd.workspace
+Index: jack-audio-connection-kit/windows/jackd.workspace
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jackd.workspace 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jackd.workspace 2010-05-04 12:05:11.000000000 +0200
@@ -20,7 +20,7 @@
<Project filename="jack_netmanager.cbp">
<Depends filename="libjackserver.cbp" />
@@ -3423,8 +3551,10 @@ Last-Update: 2010-05-02
<Depends filename="libjack.cbp" />
<Depends filename="jack_netonedriver.cbp" />
</Project>
---- a/windows/jacknetadapter.rc
-+++ b/windows/jacknetadapter.rc
+Index: jack-audio-connection-kit/windows/jacknetadapter.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jacknetadapter.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jacknetadapter.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3454,8 +3584,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/jacknetdriver.rc
-+++ b/windows/jacknetdriver.rc
+Index: jack-audio-connection-kit/windows/jacknetdriver.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jacknetdriver.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jacknetdriver.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3485,8 +3617,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/jacknetmanager.rc
-+++ b/windows/jacknetmanager.rc
+Index: jack-audio-connection-kit/windows/jacknetmanager.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jacknetmanager.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jacknetmanager.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3516,8 +3650,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/jackportaudio.rc
-+++ b/windows/jackportaudio.rc
+Index: jack-audio-connection-kit/windows/jackportaudio.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jackportaudio.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jackportaudio.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3547,8 +3683,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/jackwinmme.rc
-+++ b/windows/jackwinmme.rc
+Index: jack-audio-connection-kit/windows/jackwinmme.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/jackwinmme.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/jackwinmme.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3578,8 +3716,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/libjack.cbp
-+++ b/windows/libjack.cbp
+Index: jack-audio-connection-kit/windows/libjack.cbp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/libjack.cbp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/libjack.cbp 2010-05-04 12:05:11.000000000 +0200
@@ -25,10 +25,13 @@
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
@@ -3676,8 +3816,10 @@ Last-Update: 2010-05-02
<Extensions>
<code_completion />
<envvars />
---- a/windows/libjack.rc
-+++ b/windows/libjack.rc
+Index: jack-audio-connection-kit/windows/libjack.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/libjack.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/libjack.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3707,8 +3849,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/libjackserver.cbp
-+++ b/windows/libjackserver.cbp
+Index: jack-audio-connection-kit/windows/libjackserver.cbp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/libjackserver.cbp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/libjackserver.cbp 2010-05-04 12:05:11.000000000 +0200
@@ -26,10 +26,13 @@
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
@@ -3823,8 +3967,10 @@ Last-Update: 2010-05-02
<Extensions>
<code_completion />
<envvars />
---- a/windows/libjackserver.rc
-+++ b/windows/libjackserver.rc
+Index: jack-audio-connection-kit/windows/libjackserver.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/libjackserver.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/libjackserver.rc 2010-05-04 12:05:11.000000000 +0200
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3854,8 +4000,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/windows/portaudio/JackPortAudioDriver.cpp
-+++ b/windows/portaudio/JackPortAudioDriver.cpp
+Index: jack-audio-connection-kit/windows/portaudio/JackPortAudioDriver.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/windows/portaudio/JackPortAudioDriver.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/portaudio/JackPortAudioDriver.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -404,8 +404,8 @@
{
@@ -3884,8 +4032,10 @@ Last-Update: 2010-05-02
}
break;
---- a/windows/regex.c
-+++ /dev/null
+Index: jack-audio-connection-kit/windows/regex.c
+===================================================================
+--- jack-audio-connection-kit.orig/windows/regex.c 2010-05-03 22:59:22.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,4949 +0,0 @@
-/* Extended regular expression matching and search library,
- version 0.12.
@@ -8836,8 +8986,10 @@ Last-Update: 2010-05-02
-trim-versions-without-asking: nil
-End:
-*/
---- a/windows/regex.h
-+++ /dev/null
+Index: jack-audio-connection-kit/windows/regex.h
+===================================================================
+--- jack-audio-connection-kit.orig/windows/regex.h 2010-05-03 22:59:22.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,506 +0,0 @@
-/* Definitions for data structures and routines for the regular
- expression library, version 0.12.
@@ -9345,8 +9497,10 @@ Last-Update: 2010-05-02
-trim-versions-without-asking: nil
-End:
-*/
---- a/windows/resource.rc
-+++ b/windows/resource.rc
+Index: jack-audio-connection-kit/windows/resource.rc
+===================================================================
+--- jack-audio-connection-kit.orig/windows/resource.rc 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/windows/resource.rc 2010-05-04 12:05:11.000000000 +0200
@@ -14,8 +14,8 @@
#ifndef _MAC
@@ -9376,8 +9530,10 @@ Last-Update: 2010-05-02
VALUE "SpecialBuild", "\0"
END
END
---- a/wscript
-+++ b/wscript
+Index: jack-audio-connection-kit/wscript
+===================================================================
+--- jack-audio-connection-kit.orig/wscript 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/wscript 2010-05-04 12:05:11.000000000 +0200
@@ -11,7 +11,7 @@
import re
import Logs
@@ -9415,8 +9571,10 @@ Last-Update: 2010-05-02
if Options.options.dbus:
conf.sub_config('dbus')
if conf.env['BUILD_JACKDBUS'] != True:
---- a/common/JackDriverLoader.cpp
-+++ b/common/JackDriverLoader.cpp
+Index: jack-audio-connection-kit/common/JackDriverLoader.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackDriverLoader.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackDriverLoader.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -152,7 +152,7 @@
fprintf (stderr, "Options for driver '%s':\n", desc->name);
@@ -9426,8 +9584,10 @@ Last-Update: 2010-05-02
}
for (param_index = 0; param_index < desc->nparams; param_index++) {
---- a/common/jack/jack.h
-+++ b/common/jack/jack.h
+Index: jack-audio-connection-kit/common/jack/jack.h
+===================================================================
+--- jack-audio-connection-kit.orig/common/jack/jack.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/jack/jack.h 2010-05-04 12:05:11.000000000 +0200
@@ -732,7 +732,7 @@
* @return a null-terminated array of full port names to which the @a
* port is connected. If none, returns NULL.
@@ -9455,8 +9615,10 @@ Last-Update: 2010-05-02
* non-NULL returned value.
*
* @see jack_port_name_size(), jack_port_type_size()
---- a/dbus/sigsegv.c
-+++ b/dbus/sigsegv.c
+Index: jack-audio-connection-kit/dbus/sigsegv.c
+===================================================================
+--- jack-audio-connection-kit.orig/dbus/sigsegv.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/dbus/sigsegv.c 2010-05-04 12:05:11.000000000 +0200
@@ -99,7 +99,13 @@
jack_error("info.si_code = %d (%s)", info->si_code, si_codes[info->si_code]);
jack_error("info.si_addr = %p", info->si_addr);
@@ -9472,8 +9634,10 @@ Last-Update: 2010-05-02
#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
# if defined(SIGSEGV_STACK_IA64)
---- a/example-clients/connect.c
-+++ b/example-clients/connect.c
+Index: jack-audio-connection-kit/example-clients/connect.c
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/connect.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/connect.c 2010-05-04 12:05:11.000000000 +0200
@@ -1,6 +1,6 @@
/*
Copyright (C) 2002 Jeremy Hall
@@ -9553,8 +9717,10 @@ Last-Update: 2010-05-02
jack_client_close (client);
return 1;
}
---- a/example-clients/netsource.c
-+++ b/example-clients/netsource.c
+Index: jack-audio-connection-kit/example-clients/netsource.c
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/netsource.c 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/netsource.c 2010-05-04 12:05:11.000000000 +0200
@@ -503,11 +503,12 @@
if (hostinfo == NULL) {
fprintf (stderr, "init_sockaddr_in: unknown host: %s.\n", hostname);
@@ -9617,8 +9783,10 @@ Last-Update: 2010-05-02
}
/* try to become a client of the JACK server */
---- a/example-clients/wscript
-+++ b/example-clients/wscript
+Index: jack-audio-connection-kit/example-clients/wscript
+===================================================================
+--- jack-audio-connection-kit.orig/example-clients/wscript 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/example-clients/wscript 2010-05-04 12:05:11.000000000 +0200
@@ -57,7 +57,7 @@
conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE')
@@ -9628,8 +9796,10 @@ Last-Update: 2010-05-02
def build(bld):
if bld.env['IS_LINUX']:
---- a/linux/alsa/JackAlsaDriver.cpp
-+++ b/linux/alsa/JackAlsaDriver.cpp
+Index: jack-audio-connection-kit/linux/alsa/JackAlsaDriver.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/linux/alsa/JackAlsaDriver.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/linux/alsa/JackAlsaDriver.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -260,7 +260,7 @@
return 0;
}
@@ -9685,8 +9855,10 @@ Last-Update: 2010-05-02
/* Allocate and initialize structures that rely on the
channels counts.
---- a/linux/alsa/JackAlsaDriver.h
-+++ b/linux/alsa/JackAlsaDriver.h
+Index: jack-audio-connection-kit/linux/alsa/JackAlsaDriver.h
+===================================================================
+--- jack-audio-connection-kit.orig/linux/alsa/JackAlsaDriver.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/linux/alsa/JackAlsaDriver.h 2010-05-04 12:05:11.000000000 +0200
@@ -53,7 +53,7 @@
int alsa_driver_generic_hardware(alsa_driver_t *driver);
int alsa_driver_hw_specific(alsa_driver_t *driver, int hw_monitoring,
@@ -9696,8 +9868,10 @@ Last-Update: 2010-05-02
int alsa_driver_configure_stream(alsa_driver_t *driver, char *device_name,
const char *stream_name,
snd_pcm_t *handle,
---- a/linux/JackAtomic_os.h
-+++ b/linux/JackAtomic_os.h
+Index: jack-audio-connection-kit/linux/JackAtomic_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/linux/JackAtomic_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/linux/JackAtomic_os.h 2010-05-04 12:05:32.000000000 +0200
@@ -42,9 +42,9 @@
"1: \n"
" li %0, 0 \n"
@@ -9711,7 +9885,7 @@ Last-Update: 2010-05-02
return result;
}
-@@ -61,12 +61,21 @@
+@@ -61,13 +61,23 @@
"# CAS \n\t"
LOCK "cmpxchg %2, (%1) \n\t"
"sete %0 \n\t"
@@ -9724,20 +9898,24 @@ Last-Update: 2010-05-02
return ret;
}
-+#else
-+
+ #endif
+
++#if !defined(__i386__) && !defined(__x86_64__) && !defined(__PPC__)
+#warning using builtin gcc (version > 4.1) atomic
+
-+static inline char CAS(volatile uint32_t value, uint32_t newvalue, volatile int32_t* addr)
++static inline char CAS(volatile UInt32 value, UInt32 newvalue, volatile void* addr)
+{
-+ return __sync_bool_compare_and_swap (addr, value, newvalue);
++ return __sync_bool_compare_and_swap (&addr, value, newvalue);
+}
++#endif
++
+
#endif
- #endif
---- a/linux/JackPlatformPlug_os.h
-+++ b/linux/JackPlatformPlug_os.h
+Index: jack-audio-connection-kit/linux/JackPlatformPlug_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/linux/JackPlatformPlug_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/linux/JackPlatformPlug_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -20,6 +20,10 @@
#ifndef __JackPlatformPlug_linux__
#define __JackPlatformPlug_linux__
@@ -9749,8 +9927,10 @@ Last-Update: 2010-05-02
namespace Jack
{
struct JackRequest;
---- a/macosx/JackAtomic_os.h
-+++ b/macosx/JackAtomic_os.h
+Index: jack-audio-connection-kit/macosx/JackAtomic_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/JackAtomic_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/macosx/JackAtomic_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -41,10 +41,10 @@
"1: \n"
" li %0, 0 \n"
@@ -9779,8 +9959,10 @@ Last-Update: 2010-05-02
return ret;
}
---- a/macosx/JackPlatformPlug_os.h
-+++ b/macosx/JackPlatformPlug_os.h
+Index: jack-audio-connection-kit/macosx/JackPlatformPlug_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/JackPlatformPlug_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/macosx/JackPlatformPlug_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -20,6 +20,10 @@
#ifndef __JackPlatformPlug_APPLE__
#define __JackPlatformPlug_APPLE__
@@ -9792,8 +9974,10 @@ Last-Update: 2010-05-02
namespace Jack
{
class JackPosixMutex;
---- a/posix/JackFifo.cpp
-+++ b/posix/JackFifo.cpp
+Index: jack-audio-connection-kit/posix/JackFifo.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/posix/JackFifo.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/posix/JackFifo.cpp 2010-05-04 12:05:11.000000000 +0200
@@ -20,7 +20,7 @@
#include "JackFifo.h"
#include "JackTools.h"
@@ -9803,8 +9987,10 @@ Last-Update: 2010-05-02
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
---- a/solaris/JackPlatformPlug_os.h
-+++ b/solaris/JackPlatformPlug_os.h
+Index: jack-audio-connection-kit/solaris/JackPlatformPlug_os.h
+===================================================================
+--- jack-audio-connection-kit.orig/solaris/JackPlatformPlug_os.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/solaris/JackPlatformPlug_os.h 2010-05-04 12:05:11.000000000 +0200
@@ -20,6 +20,10 @@
#ifndef __JackPlatformPlug_sun__
#define __JackPlatformPlug_sun__
@@ -9816,3 +10002,677 @@ Last-Update: 2010-05-02
namespace Jack
{
struct JackRequest;
+Index: jack-audio-connection-kit/common/JackAPI.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackAPI.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackAPI.cpp 2010-05-04 12:05:32.000000000 +0200
+@@ -56,9 +56,9 @@
+ const char *
+ jack_get_version_string();
+
+- EXPORT jack_client_t * jack_client_open_aux (const char *client_name,
++ jack_client_t * jack_client_new_aux (const char *client_name,
+ jack_options_t options,
+- jack_status_t *status, va_list ap);
++ jack_status_t *status);
+ EXPORT jack_client_t * jack_client_open (const char *client_name,
+ jack_options_t options,
+ jack_status_t *status, ...);
+@@ -300,7 +300,7 @@
+ int options = JackUseExactName;
+ if (getenv("JACK_START_SERVER") == NULL)
+ options |= JackNoStartServer;
+- jack_client_t* res = jack_client_open_aux(client_name, (jack_options_t)options, NULL, NULL);
++ jack_client_t* res = jack_client_new_aux(client_name, (jack_options_t)options, NULL);
+ JackGlobals::fOpenMutex->Unlock();
+ return res;
+ } catch (std::bad_alloc& e) {
+@@ -317,11 +317,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_get_buffer");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_get_buffer called with an incorrect port %ld", myport);
+@@ -337,11 +333,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_name");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_name called with an incorrect port %ld", myport);
+@@ -357,11 +349,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_short_name");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_short_name called with an incorrect port %ld", myport);
+@@ -377,11 +365,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_flags");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_flags called with an incorrect port %ld", myport);
+@@ -397,11 +381,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_type");
+ #endif
+- #if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_flags called an incorrect port %ld", myport);
+@@ -417,11 +397,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_type_id");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_type_id called an incorrect port %ld", myport);
+@@ -437,11 +413,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_connected");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_connected called with an incorrect port %ld", myport);
+@@ -458,11 +430,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_connected_to");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t src = (jack_port_id_t)port_aux;
+ if (!CheckPort(src)) {
+ jack_error("jack_port_connected_to called with an incorrect port %ld", src);
+@@ -488,21 +456,13 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_tie");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t src_aux = (uint64_t)src;
+-#else
+- uint32_t src_aux = (uint32_t)src;
+-#endif
++ uintptr_t src_aux = (uintptr_t)src;
+ jack_port_id_t mysrc = (jack_port_id_t)src_aux;
+ if (!CheckPort(mysrc)) {
+ jack_error("jack_port_tie called with a NULL src port");
+ return -1;
+ }
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t dst_aux = (uint64_t)dst;
+-#else
+- uint32_t dst_aux = (uint32_t)dst;
+-#endif
++ uintptr_t dst_aux = (uintptr_t)dst;
+ jack_port_id_t mydst = (jack_port_id_t)dst_aux;
+ if (!CheckPort(mydst)) {
+ jack_error("jack_port_tie called with a NULL dst port");
+@@ -522,11 +482,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_untie");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_untie called with an incorrect port %ld", myport);
+@@ -542,11 +498,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_get_latency");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_get_latency called with an incorrect port %ld", myport);
+@@ -563,11 +515,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_set_latency");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_set_latency called with an incorrect port %ld", myport);
+@@ -585,11 +533,7 @@
+ #endif
+
+ JackClient* client = (JackClient*)ext_client;
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (client == NULL) {
+ jack_error("jack_recompute_total_latencies called with a NULL client");
+@@ -630,11 +574,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_set_name");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_set_name called with an incorrect port %ld", myport);
+@@ -660,11 +600,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_set_alias");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_set_alias called with an incorrect port %ld", myport);
+@@ -683,11 +619,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_unset_alias");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_unset_alias called with an incorrect port %ld", myport);
+@@ -706,11 +638,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_get_aliases");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_get_aliases called with an incorrect port %ld", myport);
+@@ -726,11 +654,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_request_monitor");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_request_monitor called with an incorrect port %ld", myport);
+@@ -769,11 +693,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_ensure_monitor");
+ #endif
+- #if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_ensure_monitor called with an incorrect port %ld", myport);
+@@ -789,11 +709,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_monitoring_input");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_monitoring_input called with an incorrect port %ld", myport);
+@@ -1128,11 +1044,7 @@
+ jack_error("jack_port_register called with a NULL port name or a NULL port_type");
+ return NULL;
+ } else {
+-#if defined(__x86_64__) || defined(__ppc64__)
+- return (jack_port_t *)((uint64_t)client->PortRegister(port_name, port_type, flags, buffer_size));
+-#else
+- return (jack_port_t *)client->PortRegister(port_name, port_type, flags, buffer_size);
+-#endif
++ return (jack_port_t *)((uintptr_t)client->PortRegister(port_name, port_type, flags, buffer_size));
+ }
+ }
+
+@@ -1146,11 +1058,7 @@
+ jack_error("jack_port_unregister called with a NULL client");
+ return -1;
+ }
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_unregister called with an incorrect port %ld", myport);
+@@ -1169,11 +1077,7 @@
+ jack_error("jack_port_is_mine called with a NULL client");
+ return -1;
+ }
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_is_mine called with an incorrect port %ld", myport);
+@@ -1187,11 +1091,7 @@
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_port_get_connections");
+ #endif
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_get_connections called with an incorrect port %ld", myport);
+@@ -1215,11 +1115,7 @@
+ return NULL;
+ }
+
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_get_all_connections called with an incorrect port %ld", myport);
+@@ -1242,11 +1138,7 @@
+ return 0;
+ }
+
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)port;
+-#else
+- uint32_t port_aux = (uint32_t)port;
+-#endif
++ uintptr_t port_aux = (uintptr_t)port;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_get_total_latency called with an incorrect port %ld", myport);
+@@ -1307,11 +1199,7 @@
+ jack_error("jack_port_disconnect called with a NULL client");
+ return -1;
+ }
+-#if defined(__x86_64__) || defined(__ppc64__)
+- uint64_t port_aux = (uint64_t)src;
+-#else
+- uint32_t port_aux = (uint32_t)src;
+-#endif
++ uintptr_t port_aux = (uintptr_t)src;
+ jack_port_id_t myport = (jack_port_id_t)port_aux;
+ if (!CheckPort(myport)) {
+ jack_error("jack_port_disconnect called with an incorrect port %ld", myport);
+@@ -1383,11 +1271,7 @@
+ if (!manager)
+ return NULL;
+ int res = manager->GetPort(portname); // returns a port index at least > 1
+-#if defined(__x86_64__) || defined(__ppc64__)
+- return (res == NO_PORT) ? NULL : (jack_port_t*)((uint64_t)res);
+-#else
+- return (res == NO_PORT) ? NULL : (jack_port_t*)res;
+-#endif
++ return (res == NO_PORT) ? NULL : (jack_port_t*)((uintptr_t)res);
+ }
+ }
+
+@@ -1397,11 +1281,7 @@
+ JackGlobals::CheckContext("jack_port_by_id");
+ #endif
+ /* jack_port_t* type is actually the port index */
+-#if defined(__x86_64__) || defined(__ppc64__)
+- return (jack_port_t*)((uint64_t)id);
+-#else
+- return (jack_port_t*)id;
+-#endif
++ return (jack_port_t*)((uintptr_t)id);
+ }
+
+ EXPORT int jack_engine_takeover_timebase(jack_client_t* ext_client)
+Index: jack-audio-connection-kit/common/JackLibAPI.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackLibAPI.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackLibAPI.cpp 2010-05-04 12:05:32.000000000 +0200
+@@ -36,7 +36,10 @@
+ {
+ #endif
+
+- EXPORT jack_client_t * jack_client_open_aux (const char *client_name,
++ jack_client_t * jack_client_new_aux (const char *client_name,
++ jack_options_t options,
++ jack_status_t *status);
++ jack_client_t * jack_client_open_aux (const char *client_name,
+ jack_options_t options,
+ jack_status_t *status, va_list ap);
+ EXPORT jack_client_t * jack_client_open (const char *client_name,
+@@ -52,18 +55,18 @@
+ JackLibGlobals* JackLibGlobals::fGlobals = NULL;
+ int JackLibGlobals::fClientCount = 0;
+
+-EXPORT jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap)
++jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t options, jack_status_t* status)
+ {
+ jack_varargs_t va; /* variable arguments */
+ jack_status_t my_status;
+ JackClient* client;
+
+ if (client_name == NULL) {
+- jack_error("jack_client_open called with a NULL client_name");
++ jack_error("jack_client_new called with a NULL client_name");
+ return NULL;
+ }
+
+- jack_log("jack_client_open %s", client_name);
++ jack_log("jack_client_new %s", client_name);
+
+ if (status == NULL) /* no status from caller? */
+ status = &my_status; /* use local status word */
+@@ -77,11 +80,60 @@
+ }
+
+ /* parse variable arguments */
+- if (ap) {
+- jack_varargs_parse(options, ap, &va);
++ jack_varargs_init(&va);
++
++ JackLibGlobals::Init(); // jack library initialisation
++
++ if (try_start_server(&va, options, status)) {
++ jack_error("jack server is not running or cannot be started");
++ JackLibGlobals::Destroy(); // jack library destruction
++ return 0;
++ }
++
++ if (JACK_DEBUG) {
++ client = new JackDebugClient(new JackLibClient(GetSynchroTable())); // Debug mode
+ } else {
+- jack_varargs_init(&va);
++ client = new JackLibClient(GetSynchroTable());
++ }
++
++ int res = client->Open(va.server_name, client_name, options, status);
++ if (res < 0) {
++ delete client;
++ JackLibGlobals::Destroy(); // jack library destruction
++ int my_status1 = (JackFailure | JackServerError);
++ *status = (jack_status_t)my_status1;
++ return NULL;
++ } else {
++ return (jack_client_t*)client;
++ }
++}
++
++jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap)
++{
++ jack_varargs_t va; /* variable arguments */
++ jack_status_t my_status;
++ JackClient* client;
++
++ if (client_name == NULL) {
++ jack_error("jack_client_open called with a NULL client_name");
++ return NULL;
+ }
++
++ jack_log("jack_client_open %s", client_name);
++
++ if (status == NULL) /* no status from caller? */
++ status = &my_status; /* use local status word */
++ *status = (jack_status_t)0;
++
++ /* validate parameters */
++ if ((options & ~JackOpenOptions)) {
++ int my_status1 = *status | (JackFailure | JackInvalidOption);
++ *status = (jack_status_t)my_status1;
++ return NULL;
++ }
++
++ /* parse variable arguments */
++ jack_varargs_parse(options, ap, &va);
+
+ JackLibGlobals::Init(); // jack library initialisation
+
+@@ -111,10 +163,10 @@
+
+ EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
+ {
+- try {
+ #ifdef __CLIENTDEBUG__
+ JackGlobals::CheckContext("jack_client_open");
+ #endif
++ try {
+ assert(JackGlobals::fOpenMutex);
+ JackGlobals::fOpenMutex->Lock();
+ va_list ap;
+Index: jack-audio-connection-kit/common/JackServerAPI.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/common/JackServerAPI.cpp 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/common/JackServerAPI.cpp 2010-05-04 12:05:32.000000000 +0200
+@@ -33,7 +33,10 @@
+ {
+ #endif
+
+- EXPORT jack_client_t * jack_client_open_aux (const char *client_name,
++ jack_client_t * jack_client_new_aux (const char *client_name,
++ jack_options_t options,
++ jack_status_t *status);
++ jack_client_t * jack_client_open_aux (const char *client_name,
+ jack_options_t options,
+ jack_status_t *status, va_list ap);
+ EXPORT jack_client_t * jack_client_open (const char *client_name,
+@@ -48,18 +51,18 @@
+
+ using namespace Jack;
+
+-EXPORT jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap)
++jack_client_t* jack_client_new_aux(const char* client_name, jack_options_t options, jack_status_t* status)
+ {
+ jack_varargs_t va; /* variable arguments */
+ jack_status_t my_status;
+ JackClient* client;
+
+ if (client_name == NULL) {
+- jack_error("jack_client_open called with a NULL client_name");
++ jack_error("jack_client_new called with a NULL client_name");
+ return NULL;
+ }
+
+- jack_log("jack_client_open %s", client_name);
++ jack_log("jack_client_new %s", client_name);
+
+ if (status == NULL) /* no status from caller? */
+ status = &my_status; /* use local status word */
+@@ -73,12 +76,59 @@
+ }
+
+ /* parse variable arguments */
+- if (ap) {
+- jack_varargs_parse(options, ap, &va);
++ jack_varargs_init(&va);
++
++ if (!JackServerGlobals::Init()) { // jack server initialisation
++ int my_status1 = (JackFailure | JackServerError);
++ *status = (jack_status_t)my_status1;
++ return NULL;
++ }
++
++ if (JACK_DEBUG) {
++ client = new JackDebugClient(new JackInternalClient(JackServerGlobals::fInstance, GetSynchroTable())); // Debug mode
+ } else {
+- jack_varargs_init(&va);
++ client = new JackInternalClient(JackServerGlobals::fInstance, GetSynchroTable());
++ }
++
++ int res = client->Open(va.server_name, client_name, options, status);
++ if (res < 0) {
++ delete client;
++ JackServerGlobals::Destroy(); // jack server destruction
++ int my_status1 = (JackFailure | JackServerError);
++ *status = (jack_status_t)my_status1;
++ return NULL;
++ } else {
++ return (jack_client_t*)client;
++ }
++}
++
++jack_client_t* jack_client_open_aux(const char* client_name, jack_options_t options, jack_status_t* status, va_list ap)
++{
++ jack_varargs_t va; /* variable arguments */
++ jack_status_t my_status;
++ JackClient* client;
++
++ if (client_name == NULL) {
++ jack_error("jack_client_open called with a NULL client_name");
++ return NULL;
+ }
+
++ jack_log("jack_client_open %s", client_name);
++
++ if (status == NULL) /* no status from caller? */
++ status = &my_status; /* use local status word */
++ *status = (jack_status_t)0;
++
++ /* validate parameters */
++ if ((options & ~JackOpenOptions)) {
++ int my_status1 = *status | (JackFailure | JackInvalidOption);
++ *status = (jack_status_t)my_status1;
++ return NULL;
++ }
++
++ /* parse variable arguments */
++ jack_varargs_parse(options, ap, &va);
++
+ if (!JackServerGlobals::Init()) { // jack server initialisation
+ int my_status1 = (JackFailure | JackServerError);
+ *status = (jack_status_t)my_status1;
+Index: jack-audio-connection-kit/linux/cycles.h
+===================================================================
+--- jack-audio-connection-kit.orig/linux/cycles.h 2010-05-03 22:59:22.000000000 +0200
++++ jack-audio-connection-kit/linux/cycles.h 2010-05-04 12:05:32.000000000 +0200
+@@ -103,6 +103,20 @@
+
+ #endif
+
++/* everything else but x86, amd64 or ppc */
++#if !defined (__PPC__) && !defined (__x86_64__) && !defined (__i386__)
++
++#warning No suitable get_cycles() implementation. Returning 0 instead
++
++typedef unsigned long long cycles_t;
++
++static inline cycles_t get_cycles(void)
++{
++ return 0;
++}
++
++#endif
++
+ #endif
+
+ #endif /* __jack_cycles_h__ */
+Index: jack-audio-connection-kit/macosx/coremidi/JackCoreMidiDriver.cpp
+===================================================================
+--- jack-audio-connection-kit.orig/macosx/coremidi/JackCoreMidiDriver.cpp 2010-05-03 19:32:55.000000000 +0200
++++ jack-audio-connection-kit/macosx/coremidi/JackCoreMidiDriver.cpp 2010-05-04 12:05:32.000000000 +0200
+@@ -40,11 +40,13 @@
+ void JackCoreMidiDriver::ReadProcAux(const MIDIPacketList *pktlist, jack_ringbuffer_t* ringbuffer)
+ {
+ // Write the number of packets
+- size_t size = jack_ringbuffer_write(ringbuffer, (char*)&pktlist->numPackets, sizeof(UInt32));
+- if (size != sizeof(UInt32)) {
++ size_t size = jack_ringbuffer_write_space(ringbuffer);
++ if (size < sizeof(UInt32)) {
+ jack_error("ReadProc : ring buffer is full, skip events...");
+ return;
+- }
++ }
++
++ jack_ringbuffer_write(ringbuffer, (char*)&pktlist->numPackets, sizeof(UInt32));
+
+ for (unsigned int i = 0; i < pktlist->numPackets; ++i) {
+
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list