[SCM] Debian packaging for jack-audio-connection-kit branch, master, updated. debian/1.9.5.dfsg-10-11-g22489ca
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Fri May 7 18:19:51 UTC 2010
The following commit has been merged in the master branch:
commit 23fa4f46a20ce5ce1a080089416bc3a084180810
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Fri May 7 19:46:20 2010 +0200
Update to upstream SVN revision 4008.
This change contains new POSIX semaphore based code on Linux. I hope "on
Linux" will not break targets like kFreeBSD or that the new semaphore
code triggers bugs on non-common architectures. But we don't have no
chance, we have to follow upstream. The earlier the better, because we
want to get this into squeeze...
diff --git a/debian/patches/0000_sync_upstream_VCS.patch b/debian/patches/0000_sync_upstream_VCS.patch
index 28c29f2..d4eccfd 100644
--- a/debian/patches/0000_sync_upstream_VCS.patch
+++ b/debian/patches/0000_sync_upstream_VCS.patch
@@ -1,12 +1,10 @@
-Description: Sync with upstream SVN trunk revision 4003
+Description: Sync with upstream SVN trunk revision 4008
From: Jonas Smedegaard <dr at jones.dk>
Forwarded: yes
-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 @@
+Last-Update: 2010-05-07
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -19,194 +19,243 @@
Florian Faber
Michael Voigt
Torben Hohn
@@ -24,30 +22,30 @@ Index: jack-audio-connection-kit/ChangeLog
---------------------------
Jackdmp changes log
----------------------------
+-
+---------------------------
-
--2010-01-29 Gabriel M. Beddingfield <gabriel at teuton.org>
-+2010-04-016 Stephane Letz <letz at grame.fr>
-
-- * Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF.
++
++2010-05-07 Stephane Letz <letz at grame.fr>
++
++ * Add tests to validate intclient.h API.
++ * On Linux, inter-process synchronization primitive switched to POSIX semaphore.
++
++2010-04-16 Stephane Letz <letz at grame.fr>
++
+ * Make jack_connect/jack_disconnect wait for effective port connection/disconnection.
-
--2009-12-15 Stephane Letz <letz at grame.fr>
++
+2010-04-07 Stephane Letz <letz at grame.fr>
-
-- * Shared memory manager was calling abort in case of fatal error, now return an error in caller.
++
+ * Remove call to exit in library code.
-
--2009-12-13 Stephane Letz <letz at grame.fr>
++
+2010-03-26 Stephane Letz <letz at grame.fr>
+
+ * ffado-portname-sync.patch from ticket #163 applied.
+
+2010-03-24 Stephane Letz <letz at grame.fr>
-
-- * Mario Lang alsa_io time calculation overflow patch.
++
+ * On Windows, now use TRE library for regexp (BSD license instead of GPL license).
-
++
+2010-03-19 Stephane Letz <letz at grame.fr>
+
+ * Fix some file header to have library side code use LGPL.
@@ -75,16 +73,22 @@ Index: jack-audio-connection-kit/ChangeLog
+
+ * Version 1.9.6 started.
+
-+2010-01-29 Gabriel M. Beddingfield <gabriel at teuton.org>
-+
+ 2010-01-29 Gabriel M. Beddingfield <gabriel at teuton.org>
+
+- * Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF.
+-
+ * Change JackEngineProfiling and JackAudioAdapterInterface gnuplot scripts to output SVG instead of PDF.
+
-+2009-12-15 Stephane Letz <letz at grame.fr>
-+
+ 2009-12-15 Stephane Letz <letz at grame.fr>
+
+- * Shared memory manager was calling abort in case of fatal error, now return an error in caller.
+-
+ * Shared memory manager was calling abort in case of fatal error, now return an error in caller.
+
-+2009-12-13 Stephane Letz <letz at grame.fr>
-+
+ 2009-12-13 Stephane Letz <letz at grame.fr>
+
+- * Mario Lang alsa_io time calculation overflow patch.
+-
+ * Mario Lang alsa_io time calculation overflow patch.
+
2009-12-10 Stephane Letz <letz at grame.fr>
@@ -322,7 +326,7 @@ Index: jack-audio-connection-kit/ChangeLog
- * Add a string parameter to server ==> client notification, add a new JackInfoShutdownCallback type.
- * CoreAudio backend now issue a JackInfoShutdownCallback when an unrecoverable error is detected (sampling rate change, stream configuration changeÉ)
+ * Add a string parameter to server ==> client notification, add a new JackInfoShutdownCallback type.
-+ * CoreAudio backend now issue a JackInfoShutdownCallback when an unrecoverable error is detected (sampling rate change, stream configuration changeÉ)
++ * CoreAudio backend now issue a JackInfoShutdownCallback when an unrecoverable error is detected (sampling rate change, stream configuration changed)
2009-10-17 Stephane Letz <letz at grame.fr>
@@ -348,7 +352,7 @@ Index: jack-audio-connection-kit/ChangeLog
* Fix issues in JackNetDriver::DecodeTransportData and JackNetDriver::Initialize.
2009-08-28 Stephane Letz <letz at grame.fr>
-@@ -557,7 +601,7 @@
+@@ -557,7 +606,7 @@
2008-11-21 Stephane Letz <letz at grame.fr>
* Report ringbuffer.c fixes from JACK1.
@@ -357,10 +361,8 @@ Index: jack-audio-connection-kit/ChangeLog
* Correct ressource cleanup in case of driver open failure.
2008-11-19 Stephane Letz <letz at grame.fr>
-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
+--- a/common/JackAtomicArrayState.h
++++ b/common/JackAtomicArrayState.h
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -400,10 +402,8 @@ Index: jack-audio-connection-kit/common/JackAtomicArrayState.h
#ifndef __JackAtomicArrayState__
#define __JackAtomicArrayState__
-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
+--- a/common/JackConstants.h
++++ b/common/JackConstants.h
@@ -24,7 +24,7 @@
#include "config.h"
#endif
@@ -451,10 +451,8 @@ Index: jack-audio-connection-kit/common/JackConstants.h
#define SOCKET_TIME_OUT 5 // in sec
#define DRIVER_OPEN_TIMEOUT 5 // in sec
-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
+--- a/common/JackControlAPI.h
++++ b/common/JackControlAPI.h
@@ -47,7 +47,7 @@
#define JACK_PARAM_MAX (JackParamBool + 1)
@@ -464,10 +462,8 @@ Index: jack-audio-connection-kit/common/JackControlAPI.h
/** @brief Type for parameter value */
/* intentionally similar to jack_driver_param_value_t */
-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
+--- a/common/JackError.cpp
++++ b/common/JackError.cpp
@@ -1,23 +1,23 @@
/*
- Copyright (C) 2001 Paul Davis
@@ -511,10 +507,8 @@ Index: jack-audio-connection-kit/common/JackError.cpp
#include <stdarg.h>
#include <stdio.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
+--- a/common/JackError.h
++++ b/common/JackError.h
@@ -1,22 +1,21 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -555,10 +549,8 @@ Index: jack-audio-connection-kit/common/JackError.h
*/
-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
+--- a/common/JackGraphManager.cpp
++++ b/common/JackGraphManager.cpp
@@ -385,7 +385,7 @@
void JackGraphManager::DeactivatePort(jack_port_id_t port_index)
{
@@ -568,10 +560,8 @@ Index: jack-audio-connection-kit/common/JackGraphManager.cpp
}
void JackGraphManager::GetInputPorts(int refnum, jack_int_t* res)
-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
+--- a/common/JackNetTool.cpp
++++ b/common/JackNetTool.cpp
@@ -283,7 +283,7 @@
jack_info ( "Sample rate : %u frames per second", params->fSampleRate );
jack_info ( "Period size : %u frames per period", params->fPeriodSize );
@@ -581,10 +571,8 @@ Index: jack-audio-connection-kit/common/JackNetTool.cpp
jack_info ( "Bitdepth : %s", bitdepth );
jack_info ( "Slave mode : %s", ( params->fSlaveSyncMode ) ? "sync" : "async" );
jack_info ( "Network mode : %s", mode );
-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
+--- a/common/JackShmMem.cpp
++++ b/common/JackShmMem.cpp
@@ -1,22 +1,21 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -625,10 +613,8 @@ Index: jack-audio-connection-kit/common/JackShmMem.cpp
#include "JackError.h"
#include "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
+--- a/common/JackShmMem.h
++++ b/common/JackShmMem.h
@@ -1,22 +1,21 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -669,10 +655,8 @@ Index: jack-audio-connection-kit/common/JackShmMem.h
#ifndef __JackShmMem__
#define __JackShmMem__
-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
+--- a/common/JackTools.cpp
++++ b/common/JackTools.cpp
@@ -194,7 +194,7 @@
}
@@ -700,10 +684,8 @@ Index: jack-audio-connection-kit/common/JackTools.cpp
return 0;
}
#endif
-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
+--- a/common/JackWeakAPI.cpp
++++ b/common/JackWeakAPI.cpp
@@ -1,33 +1,36 @@
-/*
-Copyright (C) 2009 Grame
@@ -906,10 +888,8 @@ Index: jack-audio-connection-kit/common/JackWeakAPI.cpp
+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));
-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
+--- a/common/driver_interface.h
++++ b/common/driver_interface.h
@@ -33,7 +33,7 @@
#define JACK_DRIVER_NAME_MAX 15
@@ -919,10 +899,8 @@ Index: jack-audio-connection-kit/common/driver_interface.h
#define JACK_DRIVER_PARAM_DESC 255
#define JACK_PATH_MAX 511
-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
+--- a/common/jack/control.h
++++ b/common/jack/control.h
@@ -48,8 +48,8 @@
/** @brief Max value that jackctl_param_type_t type can have */
#define JACK_PARAM_MAX (JackParamBool + 1)
@@ -934,10 +912,8 @@ Index: jack-audio-connection-kit/common/jack/control.h
/** @brief Type for parameter value */
/* intentionally similar to jack_driver_param_value_t */
-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
+--- a/common/shm.c
++++ b/common/shm.c
@@ -1,24 +1,3 @@
-/*
- * Copyright (C) 2003 Paul Davis
@@ -1007,10 +983,8 @@ Index: jack-audio-connection-kit/common/shm.c
return 0;
}
-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
+--- a/dbus/controller_iface_control.c
++++ b/dbus/controller_iface_control.c
@@ -87,34 +87,31 @@
{
if (!jack_controller_start_server(controller_ptr, call))
@@ -1058,10 +1032,8 @@ Index: jack-audio-connection-kit/dbus/controller_iface_control.c
}
else if (strcmp (call->method_name, "GetLoad") == 0)
{
-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
+--- a/doxyfile
++++ b/doxyfile
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
@@ -1071,10 +1043,8 @@ Index: jack-audio-connection-kit/doxyfile
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
-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
+--- a/example-clients/alsa_in.c
++++ b/example-clients/alsa_in.c
@@ -38,6 +38,8 @@
int quit = 0;
double resample_mean = 1.0;
@@ -1104,10 +1074,8 @@ Index: jack-audio-connection-kit/example-clients/alsa_in.c
resample_mean = static_resample_factor;
offset_array = malloc( sizeof(double) * smooth_size );
-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
+--- a/example-clients/alsa_out.c
++++ b/example-clients/alsa_out.c
@@ -37,6 +37,8 @@
double resample_mean = 1.0;
@@ -1137,10 +1105,8 @@ Index: jack-audio-connection-kit/example-clients/alsa_out.c
resample_mean = static_resample_factor;
offset_array = malloc( sizeof(double) * smooth_size );
-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
+--- a/example-clients/internal_metro.cpp
++++ b/example-clients/internal_metro.cpp
@@ -46,7 +46,6 @@
{
sample_t scale;
@@ -1187,10 +1153,8 @@ Index: jack-audio-connection-kit/example-clients/internal_metro.cpp
+ free(amp);
+ free(wave);
}
-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
+--- a/example-clients/internal_metro.h
++++ b/example-clients/internal_metro.h
@@ -53,6 +53,7 @@
int bpm;
jack_nframes_t tone_length, wave_length;
@@ -1199,10 +1163,8 @@ Index: jack-audio-connection-kit/example-clients/internal_metro.h
long offset ;
InternalMetro(int freq, double max_amp, int dur_arg, int bpm, char* client_name);
-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
+--- a/example-clients/metro.c
++++ b/example-clients/metro.c
@@ -257,7 +257,7 @@
if (jack_activate (client)) {
@@ -1222,10 +1184,8 @@ Index: jack-audio-connection-kit/example-clients/metro.c
+ free(wave);
exit (0);
}
-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
+--- a/linux/firewire/JackFFADODriver.cpp
++++ b/linux/firewire/JackFFADODriver.cpp
@@ -429,7 +429,7 @@
driver->capture_channels[chn].stream_type = ffado_streaming_get_capture_stream_type(driver->dev, chn);
@@ -1293,10 +1253,8 @@ Index: jack-audio-connection-kit/linux/firewire/JackFFADODriver.cpp
break;
case 'p':
cmlparams.period_size = param->value.ui;
-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
+--- a/macosx/Jack-Info.plist
++++ b/macosx/Jack-Info.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Jackservermp</string>
@@ -1314,10 +1272,8 @@ Index: jack-audio-connection-kit/macosx/Jack-Info.plist
+ <string>1.9.6</string>
</dict>
</plist>
-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
+--- a/macosx/JackMachServerChannel.cpp
++++ b/macosx/JackMachServerChannel.cpp
@@ -159,7 +159,7 @@
kern_return_t res;
if ((res = mach_msg_server(MessageHandler, 1024, fServerPort.GetPortSet(), 0)) != KERN_SUCCESS) {
@@ -1327,10 +1283,8 @@ Index: jack-audio-connection-kit/macosx/JackMachServerChannel.cpp
}
return true;
-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
+--- a/macosx/Jackdmp.xcodeproj/project.pbxproj
++++ b/macosx/Jackdmp.xcodeproj/project.pbxproj
@@ -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 */; };
@@ -1909,10 +1863,8 @@ Index: jack-audio-connection-kit/macosx/Jackdmp.xcodeproj/project.pbxproj
OTHER_LDFLAGS = (
"-framework",
Jackmp,
-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
+--- a/macosx/coreaudio/JackCoreAudioAdapter.cpp
++++ b/macosx/coreaudio/JackCoreAudioAdapter.cpp
@@ -545,10 +545,23 @@
// Creates aggregate device
@@ -1998,10 +1950,8 @@ Index: jack-audio-connection-kit/macosx/coreaudio/JackCoreAudioAdapter.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
+--- a/macosx/coreaudio/JackCoreAudioDriver.cpp
++++ b/macosx/coreaudio/JackCoreAudioDriver.cpp
@@ -922,7 +922,7 @@
if (GetDeviceIDFromUID(capture_driver_uid, &captureID) != noErr) {
jack_log("Will take default input");
@@ -2102,10 +2052,8 @@ Index: jack-audio-connection-kit/macosx/coreaudio/JackCoreAudioDriver.cpp
}
break;
-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
+--- a/posix/JackNetUnixSocket.cpp
++++ b/posix/JackNetUnixSocket.cpp
@@ -99,6 +99,13 @@
Reset();
}
@@ -2120,10 +2068,8 @@ Index: jack-audio-connection-kit/posix/JackNetUnixSocket.cpp
return fSockfd;
}
-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
+--- a/solaris/oss/JackBoomerDriver.cpp
++++ b/solaris/oss/JackBoomerDriver.cpp
@@ -985,20 +985,20 @@
case 'C':
capture = true;
@@ -2149,10 +2095,8 @@ Index: jack-audio-connection-kit/solaris/oss/JackBoomerDriver.cpp
break;
case 'e':
-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
+--- a/solaris/oss/JackOSSDriver.cpp
++++ b/solaris/oss/JackOSSDriver.cpp
@@ -904,20 +904,20 @@
case 'C':
capture = true;
@@ -2178,10 +2122,8 @@ Index: jack-audio-connection-kit/solaris/oss/JackOSSDriver.cpp
break;
case 'b':
-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
+--- a/tests/external_metro.cpp
++++ b/tests/external_metro.cpp
@@ -60,7 +60,6 @@
{
sample_t scale;
@@ -2199,10 +2141,8 @@ Index: jack-audio-connection-kit/tests/external_metro.cpp
}
int main (int argc, char *argv[])
-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
+--- a/tests/external_metro.h
++++ b/tests/external_metro.h
@@ -53,6 +53,7 @@
int bpm;
jack_nframes_t tone_length, wave_length;
@@ -2211,10 +2151,8 @@ Index: jack-audio-connection-kit/tests/external_metro.h
long offset ;
ExternalMetro(int freq, double max_amp, int dur_arg, int bpm, const char* client_name = "metro");
-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
+--- a/windows/JackCompilerDeps_os.h
++++ b/windows/JackCompilerDeps_os.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -2254,10 +2192,8 @@ Index: jack-audio-connection-kit/windows/JackCompilerDeps_os.h
#ifndef __JackCompilerDeps_WIN32__
#define __JackCompilerDeps_WIN32__
-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
+--- a/windows/JackNetWinSocket.cpp
++++ b/windows/JackNetWinSocket.cpp
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2008 Romain Moret at Grame
@@ -2297,10 +2233,8 @@ Index: jack-audio-connection-kit/windows/JackNetWinSocket.cpp
#include "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
+--- a/windows/JackNetWinSocket.h
++++ b/windows/JackNetWinSocket.h
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2008 Romain Moret at Grame
@@ -2340,10 +2274,8 @@ Index: jack-audio-connection-kit/windows/JackNetWinSocket.h
#ifndef __JackNetWinSocket__
#define __JackNetWinSocket__
-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
+--- a/windows/JackPlatformPlug_os.h
++++ b/windows/JackPlatformPlug_os.h
@@ -1,25 +1,30 @@
/*
-Copyright (C) 2004-2008 Grame
@@ -2391,10 +2323,8 @@ Index: jack-audio-connection-kit/windows/JackPlatformPlug_os.h
namespace Jack
{
struct JackRequest;
-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
+--- a/windows/JackShmMem_os.h
++++ b/windows/JackShmMem_os.h
@@ -1,28 +1,28 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -2443,10 +2373,8 @@ Index: jack-audio-connection-kit/windows/JackShmMem_os.h
// See GetProcessWorkingSetSize and SetProcessWorkingSetSize
#define CHECK_MLOCK(ptr, size) (VirtualLock((ptr), (size)) != 0)
-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
+--- a/windows/JackSystemDeps_os.h
++++ b/windows/JackSystemDeps_os.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2486,10 +2414,8 @@ Index: jack-audio-connection-kit/windows/JackSystemDeps_os.h
#ifndef __JackSystemDeps_WIN32__
#define __JackSystemDeps_WIN32__
-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
+--- a/windows/JackTypes_os.h
++++ b/windows/JackTypes_os.h
@@ -1,21 +1,22 @@
/*
- Copyright (C) 2001 Paul Davis
@@ -2529,10 +2455,8 @@ Index: jack-audio-connection-kit/windows/JackTypes_os.h
#ifndef __JackTypes_WIN32__
#define __JackTypes_WIN32__
-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
+--- a/windows/JackWinEvent.cpp
++++ b/windows/JackWinEvent.cpp
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -2572,10 +2496,8 @@ Index: jack-audio-connection-kit/windows/JackWinEvent.cpp
#include "JackWinEvent.h"
#include "JackTools.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
+--- a/windows/JackWinEvent.h
++++ b/windows/JackWinEvent.h
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -2615,10 +2537,8 @@ Index: jack-audio-connection-kit/windows/JackWinEvent.h
#ifndef __JackWinEvent__
#define __JackWinEvent__
-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
+--- a/windows/JackWinMutex.h
++++ b/windows/JackWinMutex.h
@@ -1,23 +1,22 @@
/*
- Copyright (C) 2006 Grame
@@ -2659,10 +2579,8 @@ Index: jack-audio-connection-kit/windows/JackWinMutex.h
#ifndef __JackWinMutex__
#define __JackWinMutex__
-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
+--- a/windows/JackWinNamedPipe.cpp
++++ b/windows/JackWinNamedPipe.cpp
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2702,10 +2620,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipe.cpp
#include "JackWinNamedPipe.h"
#include "JackError.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
+--- a/windows/JackWinNamedPipe.h
++++ b/windows/JackWinNamedPipe.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2745,10 +2661,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipe.h
#ifndef __JackWinNamedPipe__
#define __JackWinNamedPipe__
-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
+--- a/windows/JackWinNamedPipeClientChannel.cpp
++++ b/windows/JackWinNamedPipeClientChannel.cpp
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2788,10 +2702,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipeClientChannel.cpp
#include "JackWinNamedPipeClientChannel.h"
#include "JackRequest.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
+--- a/windows/JackWinNamedPipeClientChannel.h
++++ b/windows/JackWinNamedPipeClientChannel.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2831,10 +2743,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipeClientChannel.h
#ifndef __JackWinNamedPipeClientChannel__
#define __JackWinNamedPipeClientChannel__
-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
+--- a/windows/JackWinNamedPipeNotifyChannel.cpp
++++ b/windows/JackWinNamedPipeNotifyChannel.cpp
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2874,10 +2784,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipeNotifyChannel.cpp
#include "JackRequest.h"
#include "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
+--- a/windows/JackWinNamedPipeNotifyChannel.h
++++ b/windows/JackWinNamedPipeNotifyChannel.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2917,10 +2825,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipeNotifyChannel.h
#ifndef __JackWinNamedPipeNotifyChannel__
#define __JackWinNamedPipeNotifyChannel__
-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
+--- a/windows/JackWinNamedPipeServerChannel.cpp
++++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -2968,10 +2874,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipeServerChannel.cpp
fPipe->Close();
fRefNum = -1;
}
-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
+--- a/windows/JackWinNamedPipeServerChannel.h
++++ b/windows/JackWinNamedPipeServerChannel.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -3011,10 +2915,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipeServerChannel.h
#ifndef __JackWinNamedPipeServerChannel__
#define __JackWinNamedPipeServerChannel__
-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
+--- a/windows/JackWinNamedPipeServerNotifyChannel.h
++++ b/windows/JackWinNamedPipeServerNotifyChannel.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -3054,10 +2956,8 @@ Index: jack-audio-connection-kit/windows/JackWinNamedPipeServerNotifyChannel.h
#ifndef __JackWinNamedPipeServerNotifyChannel__
#define __JackWinNamedPipeServerNotifyChannel__
-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
+--- a/windows/JackWinProcessSync.cpp
++++ b/windows/JackWinProcessSync.cpp
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -3097,10 +2997,8 @@ Index: jack-audio-connection-kit/windows/JackWinProcessSync.cpp
#include "JackWinProcessSync.h"
#include "JackError.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
+--- a/windows/JackWinProcessSync.h
++++ b/windows/JackWinProcessSync.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2006 Grame
@@ -3140,10 +3038,8 @@ Index: jack-audio-connection-kit/windows/JackWinProcessSync.h
#ifndef __JackWinProcessSync__
#define __JackWinProcessSync__
-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
+--- a/windows/JackWinSemaphore.cpp
++++ b/windows/JackWinSemaphore.cpp
@@ -1,21 +1,21 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -3183,10 +3079,8 @@ Index: jack-audio-connection-kit/windows/JackWinSemaphore.cpp
#include "JackWinSemaphore.h"
#include "JackConstants.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
+--- a/windows/JackWinSemaphore.h
++++ b/windows/JackWinSemaphore.h
@@ -1,21 +1,22 @@
/*
-Copyright (C) 2004-2005 Grame
@@ -3226,10 +3120,8 @@ Index: jack-audio-connection-kit/windows/JackWinSemaphore.h
#ifndef __JackWinSemaphore__
#define __JackWinSemaphore__
-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
+--- a/windows/JackWinThread.cpp
++++ b/windows/JackWinThread.cpp
@@ -1,22 +1,22 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -3270,10 +3162,8 @@ Index: jack-audio-connection-kit/windows/JackWinThread.cpp
#include "JackWinThread.h"
#include "JackError.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
+--- a/windows/JackWinThread.h
++++ b/windows/JackWinThread.h
@@ -1,22 +1,22 @@
/*
-Copyright (C) 2001 Paul Davis
@@ -3314,10 +3204,8 @@ Index: jack-audio-connection-kit/windows/JackWinThread.h
#ifndef __JackWinThread__
-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
+--- a/windows/JackWinTime.c
++++ b/windows/JackWinTime.c
@@ -1,22 +1,22 @@
/*
-Copyright (C) 2001-2003 Paul Davis
@@ -3358,10 +3246,8 @@ Index: jack-audio-connection-kit/windows/JackWinTime.c
#include "JackTime.h"
-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
+--- a/windows/README
++++ b/windows/README
@@ -1,32 +1,35 @@
-------------------------------
-Jackmp on Windows
@@ -3438,10 +3324,8 @@ Index: jack-audio-connection-kit/windows/README
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... ;-)
-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
+--- a/windows/Setup/jack.ci
++++ b/windows/Setup/jack.ci
@@ -1,9 +1,9 @@
<*project
version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" >
@@ -3463,10 +3347,8 @@ Index: jack-audio-connection-kit/windows/Setup/jack.ci
<_><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</></>
-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
+--- a/windows/jackaudioadapter.rc
++++ b/windows/jackaudioadapter.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3496,10 +3378,8 @@ Index: jack-audio-connection-kit/windows/jackaudioadapter.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/jackd.rc
++++ b/windows/jackd.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3529,10 +3409,8 @@ Index: jack-audio-connection-kit/windows/jackd.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/jackd.workspace
++++ b/windows/jackd.workspace
@@ -20,7 +20,7 @@
<Project filename="jack_netmanager.cbp">
<Depends filename="libjackserver.cbp" />
@@ -3551,10 +3429,8 @@ Index: jack-audio-connection-kit/windows/jackd.workspace
<Depends filename="libjack.cbp" />
<Depends filename="jack_netonedriver.cbp" />
</Project>
-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
+--- a/windows/jacknetadapter.rc
++++ b/windows/jacknetadapter.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3584,10 +3460,8 @@ Index: jack-audio-connection-kit/windows/jacknetadapter.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/jacknetdriver.rc
++++ b/windows/jacknetdriver.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3617,10 +3491,8 @@ Index: jack-audio-connection-kit/windows/jacknetdriver.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/jacknetmanager.rc
++++ b/windows/jacknetmanager.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3650,10 +3522,8 @@ Index: jack-audio-connection-kit/windows/jacknetmanager.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/jackportaudio.rc
++++ b/windows/jackportaudio.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3683,10 +3553,8 @@ Index: jack-audio-connection-kit/windows/jackportaudio.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/jackwinmme.rc
++++ b/windows/jackwinmme.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3716,10 +3584,8 @@ Index: jack-audio-connection-kit/windows/jackwinmme.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/libjack.cbp
++++ b/windows/libjack.cbp
@@ -25,10 +25,13 @@
<Add option="-DREGEX_MALLOC" />
<Add option="-DSTDC_HEADERS" />
@@ -3816,10 +3682,8 @@ Index: jack-audio-connection-kit/windows/libjack.cbp
<Extensions>
<code_completion />
<envvars />
-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
+--- a/windows/libjack.rc
++++ b/windows/libjack.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -3849,10 +3713,8 @@ Index: jack-audio-connection-kit/windows/libjack.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/libjackserver.cbp
++++ b/windows/libjackserver.cbp
@@ -26,10 +26,13 @@
<Add option="-DSTDC_HEADERS" />
<Add option="-DSERVER_SIDE" />
@@ -3967,10 +3829,8 @@ Index: jack-audio-connection-kit/windows/libjackserver.cbp
<Extensions>
<code_completion />
<envvars />
-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
+--- a/windows/libjackserver.rc
++++ b/windows/libjackserver.rc
@@ -11,8 +11,8 @@
//
LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
@@ -4000,10 +3860,8 @@ Index: jack-audio-connection-kit/windows/libjackserver.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/windows/portaudio/JackPortAudioDriver.cpp
++++ b/windows/portaudio/JackPortAudioDriver.cpp
@@ -404,8 +404,8 @@
{
@@ -4032,10 +3890,8 @@ Index: jack-audio-connection-kit/windows/portaudio/JackPortAudioDriver.cpp
}
break;
-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
+--- a/windows/regex.c
++++ /dev/null
@@ -1,4949 +0,0 @@
-/* Extended regular expression matching and search library,
- version 0.12.
@@ -8986,10 +8842,8 @@ Index: jack-audio-connection-kit/windows/regex.c
-trim-versions-without-asking: nil
-End:
-*/
-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
+--- a/windows/regex.h
++++ /dev/null
@@ -1,506 +0,0 @@
-/* Definitions for data structures and routines for the regular
- expression library, version 0.12.
@@ -9497,10 +9351,8 @@ Index: jack-audio-connection-kit/windows/regex.h
-trim-versions-without-asking: nil
-End:
-*/
-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
+--- a/windows/resource.rc
++++ b/windows/resource.rc
@@ -14,8 +14,8 @@
#ifndef _MAC
@@ -9530,10 +9382,8 @@ Index: jack-audio-connection-kit/windows/resource.rc
VALUE "SpecialBuild", "\0"
END
END
-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
+--- a/wscript
++++ b/wscript
@@ -11,7 +11,7 @@
import re
import Logs
@@ -9571,10 +9421,8 @@ Index: jack-audio-connection-kit/wscript
if Options.options.dbus:
conf.sub_config('dbus')
if conf.env['BUILD_JACKDBUS'] != True:
-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
+--- a/common/JackDriverLoader.cpp
++++ b/common/JackDriverLoader.cpp
@@ -152,7 +152,7 @@
fprintf (stderr, "Options for driver '%s':\n", desc->name);
@@ -9584,10 +9432,8 @@ Index: jack-audio-connection-kit/common/JackDriverLoader.cpp
}
for (param_index = 0; param_index < desc->nparams; param_index++) {
-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
+--- a/common/jack/jack.h
++++ b/common/jack/jack.h
@@ -732,7 +732,7 @@
* @return a null-terminated array of full port names to which the @a
* port is connected. If none, returns NULL.
@@ -9615,10 +9461,8 @@ Index: jack-audio-connection-kit/common/jack/jack.h
* non-NULL returned value.
*
* @see jack_port_name_size(), jack_port_type_size()
-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
+--- a/dbus/sigsegv.c
++++ b/dbus/sigsegv.c
@@ -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);
@@ -9634,10 +9478,8 @@ Index: jack-audio-connection-kit/dbus/sigsegv.c
#if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64)
# if defined(SIGSEGV_STACK_IA64)
-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
+--- a/example-clients/connect.c
++++ b/example-clients/connect.c
@@ -1,6 +1,6 @@
/*
Copyright (C) 2002 Jeremy Hall
@@ -9717,10 +9559,8 @@ Index: jack-audio-connection-kit/example-clients/connect.c
jack_client_close (client);
return 1;
}
-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
+--- a/example-clients/netsource.c
++++ b/example-clients/netsource.c
@@ -503,11 +503,12 @@
if (hostinfo == NULL) {
fprintf (stderr, "init_sockaddr_in: unknown host: %s.\n", hostname);
@@ -9783,10 +9623,8 @@ Index: jack-audio-connection-kit/example-clients/netsource.c
}
/* try to become a client of the JACK server */
-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
+--- a/example-clients/wscript
++++ b/example-clients/wscript
@@ -57,7 +57,7 @@
conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE')
@@ -9796,10 +9634,8 @@ Index: jack-audio-connection-kit/example-clients/wscript
def build(bld):
if bld.env['IS_LINUX']:
-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
+--- a/linux/alsa/JackAlsaDriver.cpp
++++ b/linux/alsa/JackAlsaDriver.cpp
@@ -260,7 +260,7 @@
return 0;
}
@@ -9855,10 +9691,8 @@ Index: jack-audio-connection-kit/linux/alsa/JackAlsaDriver.cpp
/* Allocate and initialize structures that rely on the
channels counts.
-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
+--- a/linux/alsa/JackAlsaDriver.h
++++ b/linux/alsa/JackAlsaDriver.h
@@ -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,
@@ -9868,10 +9702,8 @@ Index: jack-audio-connection-kit/linux/alsa/JackAlsaDriver.h
int alsa_driver_configure_stream(alsa_driver_t *driver, char *device_name,
const char *stream_name,
snd_pcm_t *handle,
-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
+--- a/linux/JackAtomic_os.h
++++ b/linux/JackAtomic_os.h
@@ -42,9 +42,9 @@
"1: \n"
" li %0, 0 \n"
@@ -9912,10 +9744,8 @@ Index: jack-audio-connection-kit/linux/JackAtomic_os.h
+
#endif
-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
+--- a/linux/JackPlatformPlug_os.h
++++ b/linux/JackPlatformPlug_os.h
@@ -20,6 +20,10 @@
#ifndef __JackPlatformPlug_linux__
#define __JackPlatformPlug_linux__
@@ -9927,10 +9757,22 @@ Index: jack-audio-connection-kit/linux/JackPlatformPlug_os.h
namespace Jack
{
struct JackRequest;
-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
+@@ -45,8 +49,13 @@
+ namespace Jack { typedef JackPosixThread JackThread; }
+
+ /* __JackPlatformSynchro__ client activation */
++/*
+ #include "JackFifo.h"
+ namespace Jack { typedef JackFifo JackSynchro; }
++*/
++
++#include "JackPosixSemaphore.h"
++namespace Jack { typedef JackPosixSemaphore JackSynchro; }
+
+ /* __JackPlatformChannelTransaction__ */
+ #include "JackSocket.h"
+--- a/macosx/JackAtomic_os.h
++++ b/macosx/JackAtomic_os.h
@@ -41,10 +41,10 @@
"1: \n"
" li %0, 0 \n"
@@ -9959,10 +9801,8 @@ Index: jack-audio-connection-kit/macosx/JackAtomic_os.h
return ret;
}
-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
+--- a/macosx/JackPlatformPlug_os.h
++++ b/macosx/JackPlatformPlug_os.h
@@ -20,6 +20,10 @@
#ifndef __JackPlatformPlug_APPLE__
#define __JackPlatformPlug_APPLE__
@@ -9974,10 +9814,8 @@ Index: jack-audio-connection-kit/macosx/JackPlatformPlug_os.h
namespace Jack
{
class JackPosixMutex;
-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
+--- a/posix/JackFifo.cpp
++++ b/posix/JackFifo.cpp
@@ -20,7 +20,7 @@
#include "JackFifo.h"
#include "JackTools.h"
@@ -9987,10 +9825,8 @@ Index: jack-audio-connection-kit/posix/JackFifo.cpp
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.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
+--- a/solaris/JackPlatformPlug_os.h
++++ b/solaris/JackPlatformPlug_os.h
@@ -20,6 +20,10 @@
#ifndef __JackPlatformPlug_sun__
#define __JackPlatformPlug_sun__
@@ -10002,10 +9838,8 @@ Index: jack-audio-connection-kit/solaris/JackPlatformPlug_os.h
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
+--- a/common/JackAPI.cpp
++++ b/common/JackAPI.cpp
@@ -56,9 +56,9 @@
const char *
jack_get_version_string();
@@ -10415,10 +10249,8 @@ Index: jack-audio-connection-kit/common/JackAPI.cpp
}
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
+--- a/common/JackLibAPI.cpp
++++ b/common/JackLibAPI.cpp
@@ -36,7 +36,10 @@
{
#endif
@@ -10529,10 +10361,8 @@ Index: jack-audio-connection-kit/common/JackLibAPI.cpp
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
+--- a/common/JackServerAPI.cpp
++++ b/common/JackServerAPI.cpp
@@ -33,7 +33,10 @@
{
#endif
@@ -10630,10 +10460,8 @@ Index: jack-audio-connection-kit/common/JackServerAPI.cpp
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
+--- a/linux/cycles.h
++++ b/linux/cycles.h
@@ -103,6 +103,20 @@
#endif
@@ -10655,10 +10483,8 @@ Index: jack-audio-connection-kit/linux/cycles.h
#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
+--- a/macosx/coremidi/JackCoreMidiDriver.cpp
++++ b/macosx/coremidi/JackCoreMidiDriver.cpp
@@ -40,11 +40,13 @@
void JackCoreMidiDriver::ReadProcAux(const MIDIPacketList *pktlist, jack_ringbuffer_t* ringbuffer)
{
@@ -10676,3 +10502,158 @@ Index: jack-audio-connection-kit/macosx/coremidi/JackCoreMidiDriver.cpp
for (unsigned int i = 0; i < pktlist->numPackets; ++i) {
+--- a/common/JackClient.cpp
++++ b/common/JackClient.cpp
+@@ -1027,7 +1027,8 @@
+ return 0;
+ }
+
+- int int_ref, result = -1;
++ int int_ref = 0;
++ int result = -1;
+ fChannel->InternalClientLoad(GetClientControl()->fRefNum, client_name, va->load_name, va->load_init, options, (int*)status, &int_ref, &result);
+ return int_ref;
+ }
+--- a/example-clients/ipload.c
++++ b/example-clients/ipload.c
+@@ -17,9 +17,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <signal.h>
++#include <signal.h>
+ #ifndef WIN32
+-#include <unistd.h>
++#include <unistd.h>
+ #endif
+ #include <getopt.h>
+ #include <jack/jack.h>
+@@ -126,7 +126,7 @@
+ int
+ main (int argc, char *argv[])
+ {
+- jack_status_t status;
++ jack_status_t status;
+ char* name;
+
+ /* parse and validate command arguments */
+@@ -157,8 +157,8 @@
+ (JackLoadName|JackLoadInit),
+ &status, load_name, load_init);
+ if (status & JackFailure) {
+- fprintf (stderr, "could not load %s, status = 0x%2.0x\n",
+- load_name, status);
++ fprintf (stderr, "could not load %s, intclient = %d status = 0x%2.0x\n",
++ load_name, intclient, status);
+ return 2;
+ }
+ if (status & JackNameNotUnique) {
+@@ -178,23 +178,23 @@
+
+ if (wait_opt) {
+ /* define a signal handler to unload the client, then
+- * wait for it to exit */
+- #ifdef WIN32
+- signal(SIGINT, signal_handler);
+- signal(SIGABRT, signal_handler);
+- signal(SIGTERM, signal_handler);
+- #else
+- signal(SIGQUIT, signal_handler);
+- signal(SIGTERM, signal_handler);
+- signal(SIGHUP, signal_handler);
+- signal(SIGINT, signal_handler);
+- #endif
+-
+- while (1) {
+- #ifdef WIN32
+- Sleep(1000);
++ * wait for it to exit */
++ #ifdef WIN32
++ signal(SIGINT, signal_handler);
++ signal(SIGABRT, signal_handler);
++ signal(SIGTERM, signal_handler);
++ #else
++ signal(SIGQUIT, signal_handler);
++ signal(SIGTERM, signal_handler);
++ signal(SIGHUP, signal_handler);
++ signal(SIGINT, signal_handler);
++ #endif
++
++ while (1) {
++ #ifdef WIN32
++ Sleep(1000);
+ #else
+- sleep (1);
++ sleep (1);
+ #endif
+ }
+ }
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -35,6 +35,7 @@
+ #include <assert.h>
+ #include <stdarg.h>
+ #include <jack/jack.h>
++#include <jack/intclient.h>
+ #include <jack/transport.h>
+
+
+@@ -632,7 +633,57 @@
+ if (status & JackServerStarted) {
+ fprintf(stderr, "JACK server started\n");
+ }
+-
++
++ /**
++ * Internal client tests...
++ *
++ */
++ jack_intclient_t intclient;
++
++ Log("trying to load the \"inprocess\" server internal client \n");
++
++ intclient = jack_internal_client_load (client1, "inprocess",
++ (jack_options_t)(JackLoadName|JackLoadInit),
++ &status, "inprocess", "");
++
++ if (intclient == 0 || status & JackFailure) {
++ printf("!!! ERROR !!! cannot load internal client \"inprocess\" intclient %d status 0x%2.0x !\n", intclient, status);
++ } else {
++
++ Log("\"inprocess\" server internal client loaded\n");
++
++ char* internal_name = jack_get_internal_client_name(client1, intclient);
++ if (strcmp(internal_name, "inprocess") == 0) {
++ Log("jack_get_internal_client_name returns %s\n", internal_name);
++ } else {
++ printf("!!! ERROR !!! jack_get_internal_client_name returns incorrect name %s\n", internal_name);
++ }
++
++ jack_intclient_t intclient1 = jack_internal_client_handle(client1, "inprocess", &status);
++ if (intclient1 == intclient) {
++ Log("jack_internal_client_handle returns correct handle\n");
++ } else {
++ printf("!!! ERROR !!! jack_internal_client_handle returns incorrect handle %d\n", intclient1);
++ }
++
++ // Unload internal client
++ status = jack_internal_client_unload (client1, intclient);
++ if (status == 0) {
++ Log("jack_internal_client_unload done first time returns correct value\n");
++ } else {
++ printf("!!! ERROR !!! jack_internal_client_unload returns incorrect value 0x%2.0x\n", status);
++ }
++
++ // Unload internal client second time
++ status = jack_internal_client_unload (client1, intclient);
++ if (status & JackFailure && status & JackNoSuchClient) {
++ Log("jack_internal_client_unload done second time returns correct value\n");
++ } else {
++ printf("!!! ERROR !!! jack_internal_client_unload returns incorrect value 0x%2.0x\n", status);
++ }
++ }
++
++
+ /**
+ * try to register another one with the same name...
+ *
--
Debian packaging for jack-audio-connection-kit
More information about the pkg-multimedia-commits
mailing list