| 1 |
ssuominen 10/07/26 08:06:02 |
| 2 |
|
| 3 |
Added: libao-1.0.0-pulseaudio.patch |
| 4 |
Log: |
| 5 |
Fix pulseaudio module wrt #329737 by Reuben Martin. Remove -O20 from upstream default CFLAGS. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/libao/files/libao-1.0.0-pulseaudio.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libao/files/libao-1.0.0-pulseaudio.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libao/files/libao-1.0.0-pulseaudio.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libao-1.0.0-pulseaudio.patch |
| 15 |
=================================================================== |
| 16 |
http://bugs.gentoo.org/329737 |
| 17 |
http://trac.xiph.org/ticket/1689 |
| 18 |
|
| 19 |
--- src/plugins/pulse/ao_pulse.c |
| 20 |
+++ src/plugins/pulse/ao_pulse.c |
| 21 |
@@ -227,7 +227,7 @@ |
| 22 |
} |
| 23 |
|
| 24 |
|
| 25 |
- if (!(internal->simple = pa_simple_new(internal->server, fn ? t : "libao", PA_STREAM_PLAYBACK, internal->sink, fn ? t2 : "libao playback stream", &ss, &map, NULL, NULL))) |
| 26 |
+ if (!(internal->simple = pa_simple_new(internal->server, fn ? t : "libao", PA_STREAM_PLAYBACK, internal->sink, fn ? t2 : "libao playback stream", &ss, device->input_map ? &map : NULL, NULL, NULL))) |
| 27 |
return 0; |
| 28 |
|
| 29 |
device->driver_byte_format = AO_FMT_NATIVE; |
| 30 |
@@ -247,9 +247,11 @@ |
| 31 |
assert(device && device->internal); |
| 32 |
ao_pulse_internal *internal = (ao_pulse_internal *) device->internal; |
| 33 |
|
| 34 |
- pa_simple_drain(internal->simple, NULL); |
| 35 |
- pa_simple_free(internal->simple); |
| 36 |
- internal->simple = NULL; |
| 37 |
+ if (internal->simple) { |
| 38 |
+ pa_simple_drain(internal->simple, NULL); |
| 39 |
+ pa_simple_free(internal->simple); |
| 40 |
+ internal->simple = NULL; |
| 41 |
+ } |
| 42 |
|
| 43 |
return 1; |
| 44 |
} |
Archives