[Pkg-voip-commits] [portaudio19] 03/04: Imported Debian patch 19+svn20140130-1
Victor Seva Lopez
maniac-guest at moszumanska.debian.org
Sun Aug 16 06:28:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
maniac-guest pushed a commit to branch master
in repository portaudio19.
commit 633d585881fa4b84aae9833c01869776e9c3151e
Merge: e7fa9e1 9c8a50f
Author: Benjamin Drung <bdrung at debian.org>
Date: Sun Feb 16 00:26:56 2014 +0100
Imported Debian patch 19+svn20140130-1
CMakeLists.txt | 148 +-
Doxyfile | 2 +
Doxyfile.developer | 2 +
.../c/build/vs2010/PortAudioJNI/PortAudioJNI.sln | 26 +
.../build/vs2010/PortAudioJNI/PortAudioJNI.vcproj | 198 +
.../build/vs2010/PortAudioJNI/PortAudioJNI.vcxproj | 174 +
bindings/java/c/src/com_portaudio_BlockingStream.c | 352 +
bindings/java/c/src/com_portaudio_BlockingStream.h | 130 +
bindings/java/c/src/com_portaudio_PortAudio.c | 279 +
bindings/java/c/src/com_portaudio_PortAudio.h | 183 +
bindings/java/c/src/jpa_tools.c | 208 +
.../README.txt => bindings/java/c/src/jpa_tools.h | 39 +-
bindings/java/jportaudio.dox | 65 +
bindings/java/jportaudio/.classpath | 8 +
bindings/java/jportaudio/.project | 17 +
.../jportaudio/jtests/com/portaudio/PlaySine.java | 89 +
.../jportaudio/jtests/com/portaudio/TestBasic.java | 523 ++
.../src/com/portaudio/BlockingStream.java | 208 +
.../jportaudio/src/com/portaudio/DeviceInfo.java | 42 +-
.../jportaudio/src/com/portaudio/HostApiInfo.java | 38 +-
.../jportaudio/src/com/portaudio/PortAudio.java | 261 +
.../jportaudio/src/com/portaudio/StreamInfo.java | 37 +-
.../src/com/portaudio/StreamParameters.java | 34 +-
bindings/java/scripts/make_header.bat | 4 +
cmake_support/options_cmake.h.in | 10 +-
configure | 374 +-
configure.in | 92 +-
debian/changelog | 24 +
debian/control | 9 +-
debian/patches/audacity-portmixer.patch | 16 +-
debian/source.lintian-overrides | 1 -
debian/watch | 2 +-
doc/src/mainpage.dox | 14 +-
doc/src/tutorial/blocking_read_write.dox | 68 +
doc/src/tutorial/compile_cmake.dox | 29 +
doc/src/tutorial/compile_linux.dox | 77 +
doc/src/tutorial/compile_mac_coreaudio.dox | 122 +
doc/src/tutorial/compile_windows.dox | 97 +
doc/src/tutorial/compile_windows_asio_msvc.dox | 95 +
doc/src/tutorial/compile_windows_mingw.dox | 53 +
doc/src/tutorial/exploring.dox | 15 +
doc/src/tutorial/initializing_portaudio.dox | 29 +
doc/src/tutorial/open_default_stream.dox | 48 +
doc/src/tutorial/querying_devices.dox | 111 +
doc/src/tutorial/start_stop_abort.dox | 35 +
doc/src/tutorial/terminating_portaudio.dox | 20 +
doc/src/tutorial/tutorial_start.dox | 58 +
doc/src/tutorial/utility_functions.dox | 69 +
doc/src/tutorial/writing_a_callback.dox | 66 +
examples/CMakeLists.txt | 27 +
examples/pa_devs.c | 20 +-
examples/paex_ocean_shore.c | 533 ++
examples/paex_record_file.c | 453 ++
examples/paex_sine_c++.cpp | 252 +
examples/paex_write_sine.c | 15 +-
include/pa_mac_core.h | 15 +-
include/pa_win_ds.h | 29 +-
include/pa_win_wdmks.h | 106 +
include/portaudio.h | 4 +-
pablio/README.txt | 8 +-
pablio/pablio.h | 4 +-
qa/loopback/README.txt | 9 +
qa/loopback/src/audio_analyzer.c | 10 +-
qa/loopback/src/paqa.c | 4 +-
qa/paqa_devs.c | 7 +-
qa/paqa_latency.c | 90 +-
src/common/pa_front.c | 6 +-
src/common/pa_hostapi.h | 4 +-
src/common/pa_process.c | 16 +-
src/common/pa_ringbuffer.h | 5 +-
src/common/pa_trace.c | 145 +-
src/common/pa_trace.h | 20 +-
src/hostapi/alsa/pa_linux_alsa.c | 992 +--
src/hostapi/asio/pa_asio.cpp | 285 +-
src/hostapi/coreaudio/pa_mac_core.c | 200 +-
src/hostapi/coreaudio/pa_mac_core_blocking.c | 3 +-
src/hostapi/coreaudio/pa_mac_core_internal.h | 10 +-
src/hostapi/dsound/pa_win_ds.c | 178 +-
src/hostapi/jack/pa_jack.c | 16 +-
src/hostapi/oss/pa_unix_oss.c | 47 +-
src/hostapi/wasapi/mingw-include/ksmedia.h | 61 +-
src/hostapi/wasapi/pa_win_wasapi.c | 59 +-
src/hostapi/wdmks/pa_win_wdmks.c | 6791 +++++++++++++++-----
src/hostapi/wdmks/readme.txt | 11 +-
src/hostapi/wmme/pa_win_wmme.c | 16 +-
src/os/win/pa_win_waveformat.c | 8 +-
src/os/win/pa_win_wdmks_utils.c | 13 +-
src/os/win/pa_x86_plain_converters.c | 25 +-
test/CMakeLists.txt | 9 +
test/patest_dsound_find_best_latency_params.c | 514 ++
....c => patest_dsound_low_level_latency_params.c} | 342 +-
test/patest_mono.c | 5 +-
test/patest_wire.c | 35 +-
testcvs/changeme.txt | 1 +
94 files changed, 12928 insertions(+), 3076 deletions(-)
diff --cc debian/changelog
index 99819ad,0000000..e4902e3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,218 -1,0 +1,242 @@@
++portaudio19 (19+svn20140130-1) unstable; urgency=medium
++
++ * New upstream release.
++ * Let portaudio19-dev suggest portaudio19-doc. (Closes: #735538)
++
++ -- Benjamin Drung <bdrung at debian.org> Sun, 16 Feb 2014 00:26:56 +0100
++
++portaudio19 (19+svn20140114-1) unstable; urgency=medium
++
++ * New upstream release candidate.
++ * debian/watch: Strip _rc from upstream version.
++ * Bump Standards-Version to 3.9.5.
++ * Refresh portmixer patch.
++
++ -- Benjamin Drung <bdrung at debian.org> Wed, 15 Jan 2014 23:17:51 +0100
++
++portaudio19 (19+svn20111121-2) unstable; urgency=low
++
++ * Bump debhelper to version 9 and drop the lintian override.
++ * Use canonical URLs for Vcs fields.
++ * Bump Standards-Version to 3.9.4 (no changes needed).
++
++ -- Benjamin Drung <bdrung at debian.org> Wed, 02 Oct 2013 01:25:36 +0200
++
+portaudio19 (19+svn20111121-1) unstable; urgency=low
+
+ * New upstream stable release.
+ * Refresh audacity-portmixer.patch.
+ * Drop static-lib.patch (accepted upstream).
+ * Transition to Multi-Arch: same; thanks to Gregory Hainaut for the
+ patch (Closes: #645123).
+
+ -- Benjamin Drung <bdrung at debian.org> Thu, 08 Dec 2011 00:03:04 +0100
+
+portaudio19 (19+svn20110326-2) unstable; urgency=low
+
+ * Acknowledge NMU.
+ * Use linux-any instead of hardcoded list of non-Linux architectures.
+ (Closes: #634610)
+
+ -- Benjamin Drung <bdrung at debian.org> Wed, 20 Jul 2011 01:49:33 +0200
+
+portaudio19 (19+svn20110326-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add debian/patches/static-lib.patch to fix generation of libportaudio.a
+ (Closes: #626307).
+
+ -- Samuel Thibault <sthibault at debian.org> Sat, 11 Jun 2011 22:52:31 +0200
+
+portaudio19 (19+svn20110326-1) unstable; urgency=low
+
+ * New upstream stable release.
+ * Update debian/watch.
+ * Refresh audacity-portmixer.patch.
+ * Bump Standards-Version to 3.9.2 (no changes required).
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 16 Apr 2011 20:29:15 +0200
+
+portaudio19 (19+svn20110317-1) unstable; urgency=low
+
+ * New upstream stable release candidate.
+
+ -- Benjamin Drung <bdrung at debian.org> Fri, 18 Mar 2011 15:05:49 +0100
+
+portaudio19 (19+svn20110302-1) unstable; urgency=low
+
+ * New upstream stable release candidate.
+ * Drop patches that were accepted upstream.
+ * Refresh audacity-portmixer.patch.
+ * Add new PaAlsa_SetLibraryPathName at Base to libportaudio2 symbols.
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 05 Mar 2011 13:02:48 +0100
+
+portaudio19 (19+svn20101113-3) unstable; urgency=low
+
+ * Install headers for portAudio backends.
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 26 Feb 2011 16:01:54 +0100
+
+portaudio19 (19+svn20101113-2) unstable; urgency=low
+
+ * Export OSS functions.
+ * Disable parallel build which can lead to a build failure.
+
+ -- Benjamin Drung <bdrung at debian.org> Fri, 25 Feb 2011 00:51:02 +0100
+
+portaudio19 (19+svn20101113-1) unstable; urgency=low
+
+ [ Kilian Krause ]
+ * Alter Build-Depends from libjack0.100.0-dev to libjack-dev (Closes: #527423)
+
+ [ Benjamin Drung ]
+ * New upstream snapshot (Closes: #560111).
+ * Add myself to Uploaders.
+ * Refresh get-orig-source rule.
+ * Switch to debhelper 8 and use dh.
+ * Build agains libjack on all architectures (Closes: #472574).
+ * Bump Standards-Version to 3.9.1.
+ * Add ${misc:Depends} to dependencies.
+ * Update debian/copyright.
+ * Drop dpatch and switch to dpkg-source 3.0 (quilt) format.
+ * Replace 01_config.dpatch by running autoreconf (Closes: #558621).
+ * Add audacity-portmixer.patch for adding features needed to make portmixer
+ work with audacity.
+ * Add .symbols files to library packages.
+ * portaudio19-dev depends on libportaudiocpp0.
+ * Do not install .la file.
+ * Remove Mikael Magnusson from Uploaders. Thanks for your work.
+
+ -- Benjamin Drung <bdrung at debian.org> Mon, 21 Feb 2011 00:41:10 +0100
+
+portaudio19 (19+svn20071022-3) unstable; urgency=low
+
+ [ Patrick Matthäi ]
+ * Fixed doc-base section.
+ * Removed extra whitespaces at after the Abstract field in the doc-base.
+ Thanks lintian.
+
+ [ Mark Purcell ]
+ * paravoid fixed lintian:xs-vcs-header-in-debian-control
+ * Fix lintian:debian-watch-file-is-missing
+
+ -- Mark Purcell <msp at debian.org> Sun, 12 Oct 2008 15:35:36 +1100
+
+portaudio19 (19+svn20071022-2) unstable; urgency=low
+
+ * Vanilla 'dh_makeshlibs -a' does correct magic
+ - shlibs file incorrect: does not force dependency on libportaudiocpp0
+ (Closes: #447819)
+ * We only support upgrades from stable/etch 19+svn20060825-1, thus
+ libportaudio2 (>= 19+cvs20060311-1) is unnecssary
+
+ -- Mark Purcell <msp at debian.org> Thu, 25 Oct 2007 06:59:26 +0100
+
+portaudio19 (19+svn20071022-1) unstable; urgency=low
+
+ [ Mark Purcell ]
+ * New upstream release
+ - libportaudio2: new snapshot (Closes: #447338)
+
+ [ Kilian Krause ]
+ * Use ${binary:Version} for binNMU-safe uploads.
+ Add dpkg-dev (>= 1.13.19) to Build-Depends
+ * Don't ignore make clean errors.
+ * Fix dh_makeshlibs call. Get rid of libportaudiocpp0 binary:
+ shlibs-declares-dependency-on-other-package libportaudio2.
+ * Add Homepage field as added in dpkg-dev 1.14.6.
+
+ -- Mark Purcell <msp at debian.org> Tue, 23 Oct 2007 07:13:43 +0100
+
+portaudio19 (19+svn20070125-1) unstable; urgency=low
+
+ [ Mikael Magnusson ]
+ * Update to svn 20070125 (r1174)
+ * Disable JACK and ringbuffer on all architectures except i386 and
+ powerpc. (Closes: #406754: FTBFS: #error Memory barriers are not
+ defined on this system)
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Sun, 25 Mar 2007 17:04:32 +0100
+
+portaudio19 (19+svn20070113-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/rules: add binary-indep
+ * FTBFS on GNU/kFreeBSD (due to unsatisfied Build-Depends on
+ libasound2-dev) (Closes: #401052)
+ * FTBFS on GNU/kFreeBSD (pa_unix_oss support) (Closes: #406717)
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Sat, 13 Jan 2007 12:18:36 +0100
+
+portaudio19 (19+svn20060825-1) unstable; urgency=low
+
+ * Initial release. (Closes: #328873: portaudio: please package v19)
+ * Disable V18 compatibility and bump shlib dependency
+ * Change SONAME to libportaudio2.so
+ * Updated debian/copyright with more copyright holders and added the
+ licence interpretation from the PortAudio web site.
+ * Updated package descriptions and added homepage url:s.
+ * Removed unused patches: 20_compat and 30_alsa.
+ * Removed patches applied by upstream: 40_vpath_libtool and
+ 41_vpath_libtool_gen.
+ * Fixed path to low_latency_tip.txt, moved by upstream.
+ * Add print-version and get-orig-source targets to rules.
+ * Include C++ bindings.
+ * Rename libportaudio2-dev to portaudio19-dev, since it contains the
+ developer files for both the libportaudio2 and libportaudiocpp0
+ packages. Also rename libportaudio2-doc to portaudio19-doc.
+ * Include C++ examples.
+ * Bump Standards-Version to 3.7.2. No changes required.
+ * Removed old documents and added doxygen generated documentation.
+ * Updated copyright, license modified by upstream.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Thu, 24 Aug 2006 14:23:41 +0200
+
+portaudio19 (19+20041112-3) experimental; urgency=low
+
+ * Enabled OSS and JACK
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Tue, 1 Mar 2005 20:08:03 +0100
+
+portaudio19 (19+20041112-2) experimental; urgency=low
+
+ * Added missing depends to libportaudio19-dev: libasound2-dev, libjack-dev
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Fri, 19 Nov 2004 00:15:00 +0100
+
+portaudio19 (19+20041112-1) experimental; urgency=low
+
+ * New upstream release
+ * VPATH support in Makefile.in
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Sat, 13 Nov 2004 12:16:47 +0100
+
+portaudio19 (19+20041104-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Thu, 4 Nov 2004 16:46:48 +0100
+
+portaudio19 (19+20040729-2) experimental; urgency=low
+
+ * Added V18 compatibility.
+ * ALSA: Support of multiple devices for each card.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Wed, 3 Nov 2004 15:56:49 +0100
+
+portaudio19 (19+20040729-1) experimental; urgency=low
+
+ * -D_REENTRANT must be specified when building libraries.
+ * Enforce symbol resolution at build time with -Wl,-z,defs.
+ * Fixed CFLAGS in configure.
+ * Link with libm and libpthread.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Wed, 29 Sep 2004 20:24:20 +0200
+
+portaudio19 (19+20040729-0) experimental; urgency=low
+
+ * Initial Release.
+
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Tue, 28 Sep 2004 14:40:10 +0200
+
diff --cc debian/control
index 000b55e,0000000..8df560b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,81 -1,0 +1,82 @@@
+Source: portaudio19
+Priority: optional
+Section: sound
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Kilian Krause <kilian at debian.org>,
+ Jose Carlos Garcia Sogo <jsogo at debian.org>,
+ Mark Purcell <msp at debian.org>,
+ Benjamin Drung <bdrung at debian.org>
+Build-Depends: automake,
- debhelper (>= 8.1.3),
++ debhelper (>= 9),
+ dh-autoreconf,
+ doxygen,
+ dpkg-dev (>= 1.13.19),
+ libasound2-dev [linux-any],
+ libjack-dev
- Standards-Version: 3.9.2
++Standards-Version: 3.9.5
+Homepage: http://www.portaudio.com/
- Vcs-Svn: svn://svn.debian.org/pkg-voip/portaudio19/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/portaudio19/?op=log
++Vcs-Svn: svn://anonscm.debian.org/pkg-voip/portaudio19/trunk/
++Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/portaudio19/trunk/
+
+Package: libportaudio2
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Portable audio I/O - shared library
+ PortAudio is a portable audio I/O library designed for cross-platform
+ support of audio. It uses a callback mechanism to request audio
+ processing. Audio can be generated in various formats, including 32
+ bit floating point, and will be converted to the native format
+ internally.
+ .
+ This package contains the shared library.
+
+Package: libportaudiocpp0
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Portable audio I/O C++ bindings - shared library
+ PortAudio is a portable audio I/O library designed for cross-platform
+ support of audio. It uses a callback mechanism to request audio
+ processing. Audio can be generated in various formats, including 32
+ bit floating point, and will be converted to the native format
+ internally.
+ .
+ This package contains the shared library of the C++ bindings.
+
+Package: portaudio19-dev
+Section: devel
+Architecture: any
+Depends: libasound2-dev [linux-any],
+ libjack-dev,
+ libportaudio2 (= ${binary:Version}),
+ libportaudiocpp0 (= ${binary:Version}),
+ ${misc:Depends}
++Suggests: portaudio19-doc
+Conflicts: libportaudio-19-dev, libportaudio-dev, libportaudio19-dev
+Replaces: libportaudio-19-dev, libportaudio19-dev
+Description: Portable audio I/O - development files
+ PortAudio is a portable audio I/O library designed for cross-platform
+ support of audio. It uses a callback mechanism to request audio
+ processing. Audio can be generated in various formats, including 32
+ bit floating point, and will be converted to the native format
+ internally.
+ .
+ This package contains the development files.
+
+Package: portaudio19-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Portable audio I/O - documentation
+ PortAudio is a portable audio I/O library designed for cross-platform
+ support of audio. It uses a callback mechanism to request audio
+ processing. Audio can be generated in various formats, including 32
+ bit floating point, and will be converted to the native format
+ internally.
+ .
+ This package contains the documentation.
diff --cc debian/patches/audacity-portmixer.patch
index d864b44,0000000..7d13305
mode 100644,000000..100644
--- a/debian/patches/audacity-portmixer.patch
+++ b/debian/patches/audacity-portmixer.patch
@@@ -1,322 -1,0 +1,322 @@@
+Description: Add features needed to make portmixer work with audacity.
+Author: Audacity Team
+Last-Update: 2011-12-07
+
+--- a/include/pa_win_ds.h
++++ b/include/pa_win_ds.h
- @@ -89,6 +89,21 @@
++@@ -86,6 +86,21 @@
+
+ }PaWinDirectSoundStreamInfo;
+
++/** Retrieve the GUID of the input device.
++
++ @param stream The stream to query.
++
++ @return A pointer to the GUID, or NULL if none.
++*/
++LPGUID PaWinDS_GetStreamInputGUID( PaStream* s );
++
++/** Retrieve the GUID of the output device.
++
++ @param stream The stream to query.
++
++ @return A pointer to the GUID, or NULL if none.
++*/
++LPGUID PaWinDS_GetStreamOutputGUID( PaStream* s );
+
+
+ #ifdef __cplusplus
+--- a/include/portaudio.h
++++ b/include/portaudio.h
+@@ -1146,6 +1146,15 @@
+ signed long Pa_GetStreamWriteAvailable( PaStream* stream );
+
+
++/** Retrieve the host type handling an open stream.
++
++ @return Returns a non-negative value representing the host API type
++ handling an open stream or, a PaErrorCode (which are always negative)
++ if PortAudio is not initialized or an error is encountered.
++*/
++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream );
++
++
+ /* Miscellaneous utilities */
+
+
+--- /dev/null
++++ b/include/pa_unix_oss.h
+@@ -0,0 +1,104 @@
++#ifndef PA_UNIX_OSS_H
++#define PA_UNIX_OSS_H
++
++/*
++ * $Id: portaudio.patch,v 1.10 2009-06-30 04:52:59 llucius Exp $
++ * PortAudio Portable Real-Time Audio Library
++ * OSS-specific extensions
++ *
++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files
++ * (the "Software"), to deal in the Software without restriction,
++ * including without limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * Any person wishing to distribute modifications to the Software is
++ * requested to send the modifications to the original developer so that
++ * they can be incorporated into the canonical version.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++/** @file
++ * OSS-specific PortAudio API extension header file.
++ */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++const char *PaOSS_GetStreamInputDevice( PaStream *s );
++
++const char *PaOSS_GetStreamOutputDevice( PaStream *s );
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++#ifndef PA_UNIX_OSS_H
++#define PA_UNIX_OSS_H
++
++/*
++ * $Id: portaudio.patch,v 1.10 2009-06-30 04:52:59 llucius Exp $
++ * PortAudio Portable Real-Time Audio Library
++ * OSS-specific extensions
++ *
++ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining
++ * a copy of this software and associated documentation files
++ * (the "Software"), to deal in the Software without restriction,
++ * including without limitation the rights to use, copy, modify, merge,
++ * publish, distribute, sublicense, and/or sell copies of the Software,
++ * and to permit persons to whom the Software is furnished to do so,
++ * subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be
++ * included in all copies or substantial portions of the Software.
++ *
++ * Any person wishing to distribute modifications to the Software is
++ * requested to send the modifications to the original developer so that
++ * they can be incorporated into the canonical version.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
++ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
++ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ *
++ */
++
++/** @file
++ * OSS-specific PortAudio API extension header file.
++ */
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++const char *PaOSS_GetStreamInputDevice( PaStream *s );
++
++const char *PaOSS_GetStreamOutputDevice( PaStream *s );
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+--- a/src/common/pa_front.c
++++ b/src/common/pa_front.c
+@@ -1216,8 +1216,10 @@
+ hostApiInputParametersPtr, hostApiOutputParametersPtr,
+ sampleRate, framesPerBuffer, streamFlags, streamCallback, userData );
+
+- if( result == paNoError )
++ if( result == paNoError ) {
+ AddOpenStream( *stream );
++ PA_STREAM_REP(*stream)->hostApiType = hostApi->info.type;
++ }
+
+
+ PA_LOGAPI(("Pa_OpenStream returned:\n" ));
+@@ -1729,6 +1731,32 @@
+ return result;
+ }
+
++PaHostApiTypeId Pa_GetStreamHostApiType( PaStream* stream )
++{
++ PaError error = PaUtil_ValidateStreamPointer( stream );
++ PaHostApiTypeId result;
++
++#ifdef PA_LOG_API_CALLS
++ PaUtil_DebugPrint("Pa_GetStreamHostApiType called:\n" );
++ PaUtil_DebugPrint("\tPaStream* stream: 0x%p\n", stream );
++#endif
++
++ if( error == paNoError )
++ {
++ result = PA_STREAM_REP(stream)->hostApiType;
++ }
++ else
++ {
++ result = (PaHostApiTypeId) error;
++ }
++
++#ifdef PA_LOG_API_CALLS
++ PaUtil_DebugPrint("Pa_GetStreamHostApiType returned:\n" );
++ PaUtil_DebugPrint("\tPaError: %d ( %s )\n\n", result, Pa_GetErrorText( result ) );
++#endif
++
++ return result;
++}
+
+ PaError Pa_GetSampleSize( PaSampleFormat format )
+ {
+--- a/src/common/pa_stream.c
++++ b/src/common/pa_stream.c
+@@ -93,6 +93,8 @@
+ streamRepresentation->streamInfo.inputLatency = 0.;
+ streamRepresentation->streamInfo.outputLatency = 0.;
+ streamRepresentation->streamInfo.sampleRate = 0.;
++
++ streamRepresentation->hostApiType = 0;
+ }
+
+
+--- a/src/common/pa_stream.h
++++ b/src/common/pa_stream.h
+@@ -152,6 +152,7 @@
+ PaStreamFinishedCallback *streamFinishedCallback;
+ void *userData;
+ PaStreamInfo streamInfo;
++ PaHostApiTypeId hostApiType;
+ } PaUtilStreamRepresentation;
+
+
+--- a/src/hostapi/coreaudio/pa_mac_core_blocking.c
++++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c
+@@ -66,6 +66,9 @@
+ #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS
+ # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) )
+ # define OSAtomicAnd32( a, b ) ( (*(b)) &= (a) )
++#elif MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
++# define OSAtomicOr32( a, b ) BitOrAtomic( a, (UInt32 *) b )
++# define OSAtomicAnd32( a, b ) BitAndAtomic( a, (UInt32 *) b )
+ #else
+ # include <libkern/OSAtomic.h>
+ #endif
+--- a/src/hostapi/alsa/pa_linux_alsa.c
++++ b/src/hostapi/alsa/pa_linux_alsa.c
- @@ -611,6 +611,7 @@
++@@ -621,6 +621,7 @@
+ StreamDirection streamDir;
+
+ snd_pcm_channel_area_t *channelAreas; /* Needed for channel adaption */
++ int card;
+ } PaAlsaStreamComponent;
+
+ /* Implementation specific stream structure */
- @@ -1806,6 +1807,7 @@
++@@ -1873,6 +1874,7 @@
+ {
+ PaError result = paNoError;
+ PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat = paNoError;
++ snd_pcm_info_t* pcmInfo;
+ assert( params->channelCount > 0 );
+
+ /* Make sure things have an initial value */
- @@ -1826,6 +1828,9 @@
++@@ -1900,6 +1902,9 @@
+ self->device = params->device;
+
+ PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir, &self->pcm ) );
++
++ snd_pcm_info_alloca( &pcmInfo );
++ self->card = snd_pcm_info_get_card( pcmInfo );
+ self->nfds = alsa_snd_pcm_poll_descriptors_count( self->pcm );
+
+ PA_ENSURE( hostSampleFormat = PaUtil_SelectClosestAvailableFormat( GetAvailableFormats( self->pcm ), userSampleFormat ) );
- @@ -4519,9 +4524,7 @@
++@@ -4588,9 +4593,7 @@
+ /* XXX: More descriptive error? */
+ PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
+
+- alsa_snd_pcm_info_alloca( &pcmInfo );
+- PA_ENSURE( alsa_snd_pcm_info( stream->capture.pcm, pcmInfo ) );
+- *card = alsa_snd_pcm_info_get_card( pcmInfo );
++ *card = stream->capture.card;
+
+ error:
+ return result;
- @@ -4537,9 +4540,7 @@
++@@ -4607,9 +4610,7 @@
+ /* XXX: More descriptive error? */
+ PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
+
+- alsa_snd_pcm_info_alloca( &pcmInfo );
+- PA_ENSURE( alsa_snd_pcm_info( stream->playback.pcm, pcmInfo ) );
+- *card = alsa_snd_pcm_info_get_card( pcmInfo );
++ *card = stream->playback.card;
+
+ error:
+ return result;
+--- a/src/hostapi/oss/pa_unix_oss.c
++++ b/src/hostapi/oss/pa_unix_oss.c
- @@ -2028,3 +2028,26 @@
++@@ -2043,3 +2043,26 @@
+ #endif
+ }
+
++const char *PaOSS_GetStreamInputDevice( PaStream* s )
++{
++ PaOssStream *stream = (PaOssStream*)s;
++
++ if( stream->capture )
++ {
++ return stream->capture->devName;
++ }
++
++ return NULL;
++}
++
++const char *PaOSS_GetStreamOutputDevice( PaStream* s )
++{
++ PaOssStream *stream = (PaOssStream*)s;
++
++ if( stream->playback )
++ {
++ return stream->playback->devName;
++ }
++
++ return NULL;
++}
+--- a/configure.in
++++ b/configure.in
- @@ -365,6 +365,7 @@
++@@ -405,6 +405,7 @@
+ DLL_LIBS="$DLL_LIBS -lossaudio"
+ LIBS="$LIBS -lossaudio"
+ fi
++ INCLUDES="$INCLUDES pa_unix_oss.h"
+ AC_DEFINE(PA_USE_OSS,1)
+ fi
+
diff --cc debian/watch
index fc6b12e,0000000..1688b14
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
+version=3
- opts=uversionmangle=s/_/\+svn/ \
++opts=uversionmangle=s/_/\+svn/;s/_rc// \
+ http://www.portaudio.com/archives/pa_stable_v(19_.*)\.t(?:ar\.)?gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/portaudio19.git
More information about the Pkg-voip-commits
mailing list