Mercurial > mxe-octave

annotate src/portaudio-1-win32.patch @ 3641:f362e10a0fa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
portaudio: update to 19_20140130 * src/portaudio.mk: update version, settings for mingw-64 * src/portaudio-1-win32.patch: update patch
author John Donoghue
date Tue, 01 Jul 2014 09:48:50 -0400
parents 52c2d81ac7d5
children 90a5bdf9f501
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 972
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
2688
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
4 diff -aur portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
5 --- portaudio/src/hostapi/dsound/pa_win_ds.c 2011-11-10 14:51:15.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
6 +++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c 2012-03-02 21:45:29.000000000 +0000
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
7 @@ -860,6 +860,9 @@
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
8 case DSSPEAKER_STEREO: count = 2; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
9 case DSSPEAKER_SURROUND: count = 4; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
10 case DSSPEAKER_5POINT1: count = 6; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
11 +#ifndef DSSPEAKER_7POINT1
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
12 +#define DSSPEAKER_7POINT1 0x00000007
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
13 +#endif
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
14 case DSSPEAKER_7POINT1: count = 8; break;
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
15 #ifndef DSSPEAKER_7POINT1_SURROUND
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
16 #define DSSPEAKER_7POINT1_SURROUND 0x00000008
3641
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
17 diff -Nuar portaudio/src/hostapi/dsound/pa_win_ds.c portaudio-patched/src/hostapi/dsound/pa_win_ds.c
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
18 --- portaudio/src/hostapi/dsound/pa_win_ds.c 2014-02-02 14:16:01.916602634 +0100
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
19 +++ portaudio-patched/src/hostapi/dsound/pa_win_ds.c 2014-02-02 14:17:19.340378622 +0100
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
20 @@ -2108,7 +2108,8 @@
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
21 }
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
22 else
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
23 {
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
24 - CalculateBufferSettings( &stream->hostBufferSizeFrames, &pollingPeriodFrames,
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
25 + CalculateBufferSettings( (unsigned long*)&stream->hostBufferSizeFrames,
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
26 + &pollingPeriodFrames,
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
27 /* isFullDuplex = */ (inputParameters && outputParameters),
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
28 suggestedInputLatencyFrames,
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
29 suggestedOutputLatencyFrames,
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
30 diff --git a/configure.in b/configure.in
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
31 index 305b64e..3f3b31e 100644
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
32 --- a/configure.in
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
33 +++ b/configure.in
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
34 @@ -318,7 +318,7 @@ case "${host_os}" in
972
e5d55b815b89 improved naming of patch files
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35
2688
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
36 if [[ "x$with_wdmks" = "xyes" ]]; then
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
37 DXDIR="$with_dxdir"
3641
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
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
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
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
f362e10a0fa7 portaudio: update to 19_20140130
John Donoghue
parents: 2688
diff changeset
40 LIBS="${LIBS} -lwinmm -lm -luuid -lsetupapi -lole32"
2688
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
41 DLL_LIBS="${DLL_LIBS} -lwinmm -lm -L$DXDIR/lib -luuid -lsetupapi -lole32"
52c2d81ac7d5 Update PortAudio v19 from 20071207 to 20111121
Stefan Hajnoczi <stefanha@gmail.com>
parents: 2353
diff changeset
42 #VC98="\"/c/Program Files/Microsoft Visual Studio/VC98/Include\""