wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated winepulse-PulseAudio_Support patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2022-06-19 19:25:59 +10:00
parent a51c679f34
commit 776c47da46
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
patches/winepulse-PulseAudio_Support/0001-winepulse.drv-Use-a-separate-mainloop-and-ctx-for-pu.patch
View File

@ -1,18 +1,18 @@
From 012ebe712d84fa4242e3d44562aab45a5360b72c Mon Sep 17 00:00:00 2001
From abb20359684c77a063f6f3106fa51d8e8b25efa8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 4 Nov 2015 02:57:56 +0100
Subject: [PATCH] winepulse.drv: Use a separate mainloop and ctx for
pulse_test_connect.
---
dlls/winepulse.drv/pulse.c | 59 ++++++++++++++++++--------------------
1 file changed, 28 insertions(+), 31 deletions(-)
dlls/winepulse.drv/pulse.c | 61 ++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 32 deletions(-)
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
index 6552e4ce250..e82e6f4d9a7 100644
index 0e504b6b6dd..a1fcbcd8492 100644
--- a/dlls/winepulse.drv/pulse.c
+++ b/dlls/winepulse.drv/pulse.c
@@ -587,7 +587,7 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
@@ -659,7 +659,7 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
fmt->dwChannelMask = pa_mask;
}
@ -21,7 +21,7 @@ index 6552e4ce250..e82e6f4d9a7 100644
WAVEFORMATEX *wfx = &fmt->Format;
pa_stream *stream;
pa_channel_map map;
@@ -606,7 +606,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) {
@@ -678,7 +678,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) {
attr.minreq = attr.fragsize = pa_frame_size(&ss);
attr.prebuf = 0;
@ -30,7 +30,7 @@ index 6552e4ce250..e82e6f4d9a7 100644
if (stream)
pa_stream_set_state_callback(stream, pulse_stream_state, NULL);
if (!stream)
@@ -617,7 +617,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) {
@@ -689,7 +689,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) {
else
ret = pa_stream_connect_record(stream, NULL, &attr, PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS);
if (ret >= 0) {
@ -39,7 +39,7 @@ index 6552e4ce250..e82e6f4d9a7 100644
pa_stream_get_state(stream) == PA_STREAM_CREATING)
{}
if (pa_stream_get_state(stream) == PA_STREAM_READY) {
@@ -628,7 +628,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) {
@@ -700,7 +700,7 @@ static void pulse_probe_settings(int render, WAVEFORMATEXTENSIBLE *fmt) {
else
length = pa_stream_get_buffer_attr(stream)->fragsize;
pa_stream_disconnect(stream);
@ -48,7 +48,7 @@ index 6552e4ce250..e82e6f4d9a7 100644
pa_stream_get_state(stream) == PA_STREAM_READY)
{}
}
@@ -675,31 +675,32 @@ static NTSTATUS pulse_test_connect(void *args)
@@ -747,31 +747,32 @@ static NTSTATUS pulse_test_connect(void *args)
struct pulse_config *config = params->config;
pa_operation *o;
int ret;
@ -92,7 +92,7 @@ index 6552e4ce250..e82e6f4d9a7 100644
if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED)
goto fail;
@@ -708,15 +709,15 @@ static NTSTATUS pulse_test_connect(void *args)
@@ -780,15 +781,15 @@ static NTSTATUS pulse_test_connect(void *args)
break;
}
@ -102,8 +102,9 @@ index 6552e4ce250..e82e6f4d9a7 100644
TRACE("Test-connected to server %s with protocol version: %i.\n",
- pa_context_get_server(pulse_ctx),
- pa_context_get_server_protocol_version(pulse_ctx));
+ pa_context_get_server(ctx),
pa_context_get_server_protocol_version(pulse_ctx));
+ pa_context_get_server_protocol_version(ctx));
- pulse_probe_settings(1, &pulse_fmt[0]);
- pulse_probe_settings(0, &pulse_fmt[1]);
@ -112,7 +113,7 @@ index 6552e4ce250..e82e6f4d9a7 100644
free_phys_device_lists();
list_init(&g_phys_speakers);
@@ -725,26 +726,24 @@ static NTSTATUS pulse_test_connect(void *args)
@@ -797,26 +798,24 @@ static NTSTATUS pulse_test_connect(void *args)
pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio");
pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio");
@ -145,7 +146,7 @@ index 6552e4ce250..e82e6f4d9a7 100644
config->modes[0].format = pulse_fmt[0];
config->modes[0].def_period = pulse_def_period[0];
@@ -759,10 +758,8 @@ static NTSTATUS pulse_test_connect(void *args)
@@ -831,10 +830,8 @@ static NTSTATUS pulse_test_connect(void *args)
return STATUS_SUCCESS;
fail:
@ -159,5 +160,5 @@ index 6552e4ce250..e82e6f4d9a7 100644
params->result = E_FAIL;
return STATUS_SUCCESS;
--
2.34.1
2.35.1