[PATCH v7 4/4] winepulse.drv: remove unused pulse_config

Claire Girka wine at gitlab.winehq.org
Mon Jul 4 13:52:57 CDT 2022


From: Claire Girka <claire at sitedethib.com>

---
 dlls/winepulse.drv/mmdevdrv.c |  3 ---
 dlls/winepulse.drv/pulse.c    | 10 ----------
 dlls/winepulse.drv/unixlib.h  | 11 -----------
 3 files changed, 24 deletions(-)

diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 6b78a56388b..446354fb9a5 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -60,8 +60,6 @@ enum DriverPriority {
     Priority_Preferred
 };
 
-static struct pulse_config pulse_config;
-
 static HANDLE pulse_thread;
 static struct list g_sessions = LIST_INIT(g_sessions);
 static struct list g_devices_cache = LIST_INIT(g_devices_cache);
@@ -492,7 +490,6 @@ int WINAPI AUDDRV_GetPriority(void)
     char *name;
 
     params.name   = name = get_application_name(FALSE);
-    params.config = &pulse_config;
     pulse_call(test_connect, &params);
     free(name);
     return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable;
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
index 8bd5e704729..cc10694ceb0 100644
--- a/dlls/winepulse.drv/pulse.c
+++ b/dlls/winepulse.drv/pulse.c
@@ -806,7 +806,6 @@ static NTSTATUS pulse_get_device_period(void *args)
 static NTSTATUS pulse_test_connect(void *args)
 {
     struct test_connect_params *params = args;
-    struct pulse_config *config = params->config;
     PhysDevice *dev;
     pa_operation *o;
     int ret;
@@ -889,13 +888,6 @@ static NTSTATUS pulse_test_connect(void *args)
     pa_mainloop_free(pulse_ml);
     pulse_ml = NULL;
 
-    config->modes[0].format = pulse_fmt[0];
-    config->modes[0].def_period = pulse_def_period[0];
-    config->modes[0].min_period = pulse_min_period[0];
-    config->modes[1].format = pulse_fmt[1];
-    config->modes[1].def_period = pulse_def_period[1];
-    config->modes[1].min_period = pulse_min_period[1];
-
     pulse_unlock();
 
     params->result = S_OK;
@@ -2677,12 +2669,10 @@ static NTSTATUS pulse_wow64_test_connect(void *args)
     {
         PTR32 name;
         HRESULT result;
-        PTR32 config;
     } *params32 = args;
     struct test_connect_params params =
     {
         .name = ULongToPtr(params32->name),
-        .config = ULongToPtr(params32->config), /* struct pulse_config is identical */
     };
     pulse_test_connect(&params);
     params32->result = params.result;
diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h
index 51d6baf500a..a9224b3fbb3 100644
--- a/dlls/winepulse.drv/unixlib.h
+++ b/dlls/winepulse.drv/unixlib.h
@@ -29,16 +29,6 @@ enum phys_device_bus_type {
     phys_device_bus_usb
 };
 
-struct pulse_config
-{
-    struct
-    {
-        WAVEFORMATEXTENSIBLE format;
-        REFERENCE_TIME def_period;
-        REFERENCE_TIME min_period;
-    } modes[2];
-};
-
 struct endpoint
 {
     unsigned int name;
@@ -218,7 +208,6 @@ struct test_connect_params
 {
     const char *name;
     HRESULT result;
-    struct pulse_config *config;
 };
 
 struct is_started_params
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/337



More information about the wine-devel mailing list