Mercurial > mxe-octave

comparison src/portaudio-1-win32.patch @ 4300:90a5bdf9f501

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
portaudio: update to v19.6 * src/portaudio-1-win32.patch: updated patch * src/portaudio.mk: update version, checksum
author John D
date Fri, 30 Dec 2016 08:53:44 -0500
parents f362e10a0fa7
children
comparison
equal deleted inserted replaced
4299:920efecee003 4300:90a5bdf9f501
1 This file is part of MXE. 1 diff -ur portaudio.orig/src/hostapi/dsound/pa_win_ds.c portaudio/src/hostapi/dsound/pa_win_ds.c
2 See index.html for further information. 2 --- portaudio.orig/src/hostapi/dsound/pa_win_ds.c 2016-12-30 08:41:50.075512531 -0500
3 3 +++ portaudio/src/hostapi/dsound/pa_win_ds.c 2016-12-30 08:46:26.248068904 -0500
4 diff -aur portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c 4 @@ -904,6 +904,9 @@
5 --- portaudio/src/hostapi/dsound/pa_win_ds.c 2011-11-10 14:51:15.000000000 +0000
6 +++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c 2012-03-02 21:45:29.000000000 +0000
7 @@ -860,6 +860,9 @@
8 case DSSPEAKER_STEREO: count = 2; break; 5 case DSSPEAKER_STEREO: count = 2; break;
9 case DSSPEAKER_SURROUND: count = 4; break; 6 case DSSPEAKER_SURROUND: count = 4; break;
10 case DSSPEAKER_5POINT1: count = 6; break; 7 case DSSPEAKER_5POINT1: count = 6; break;
11 +#ifndef DSSPEAKER_7POINT1 8 +#ifndef DSSPEAKER_7POINT1
12 +#define DSSPEAKER_7POINT1 0x00000007 9 +#define DSSPEAKER_7POINT1 0x00000007
13 +#endif 10 +#endif
14 case DSSPEAKER_7POINT1: count = 8; break; 11 case DSSPEAKER_7POINT1: count = 8; break;
15 #ifndef DSSPEAKER_7POINT1_SURROUND 12 #ifndef DSSPEAKER_7POINT1_SURROUND
16 #define DSSPEAKER_7POINT1_SURROUND 0x00000008 13 #define DSSPEAKER_7POINT1_SURROUND 0x00000008
17 diff -Nuar portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c 14 @@ -2136,7 +2139,8 @@
18 --- portaudio/src/hostapi/dsound/pa_win_ds.c 2014-02-02 14:16:01.916602634 +0100
19 +++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c 2014-02-02 14:17:19.340378622 +0100
20 @@ -2108,7 +2108,8 @@
21 } 15 }
22 else 16 else
23 { 17 {
24 - CalculateBufferSettings( &stream->hostBufferSizeFrames, &pollingPeriodFrames, 18 - CalculateBufferSettings( &stream->hostBufferSizeFrames, &pollingPeriodFrames,
25 + CalculateBufferSettings( (unsigned long*)&stream->hostBufferSizeFrames, 19 + CalculateBufferSettings( (unsigned long *)&stream->hostBufferSizeFrames,
26 + &pollingPeriodFrames, 20 + &pollingPeriodFrames,
27 /* isFullDuplex = */ (inputParameters && outputParameters), 21 /* isFullDuplex = */ (inputParameters && outputParameters),
28 suggestedInputLatencyFrames, 22 suggestedInputLatencyFrames,
29 suggestedOutputLatencyFrames, 23 suggestedOutputLatencyFrames,
30 diff --git a/configure.in b/configure.in
31 index 305b64e..3f3b31e 100644
32 --- a/configure.in
33 +++ b/configure.in
34 @@ -318,7 +318,7 @@ case "${host_os}" in
35
36 if [[ "x$with_wdmks" = "xyes" ]]; then
37 DXDIR="$with_dxdir"
38 - add_objects src/hostapi/wdmks/pa_win_wdmks.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_wdmks_util.o src/os/win/pa_win_waveformat.o
39 + add_objects src/hostapi/wdmks/pa_win_wdmks.o src/common/pa_ringbuffer.o src/os/win/pa_win_hostapis.o src/os/win/pa_win_util.o src/os/win/pa_win_wdmks_utils.o src/os/win/pa_win_waveformat.o
40 LIBS="${LIBS} -lwinmm -lm -luuid -lsetupapi -lole32"
41 DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -luuid -lsetupapi -lole32"
42 #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""