Module: wine Branch: master Commit: 460eaee43de8a44ea35cfdc5cdc1ca2aa015c45d URL: https://gitlab.winehq.org/wine/wine/-/commit/460eaee43de8a44ea35cfdc5cdc1ca2...
Author: Davide Beatrici git@davidebeatrici.dev Date: Tue May 2 02:23:25 2023 +0200
mmdevapi: Remove unused "channel" member in set_volumes_params.
---
dlls/mmdevapi/session.c | 1 - dlls/mmdevapi/unixlib.h | 1 - dlls/winealsa.drv/alsa.c | 2 -- dlls/winealsa.drv/mmdevdrv.c | 1 - dlls/winecoreaudio.drv/coreaudio.c | 2 -- dlls/winecoreaudio.drv/mmdevdrv.c | 1 - dlls/wineoss.drv/mmdevdrv.c | 1 - dlls/wineoss.drv/oss.c | 2 -- dlls/winepulse.drv/mmdevdrv.c | 1 - dlls/winepulse.drv/pulse.c | 2 -- 10 files changed, 14 deletions(-)
diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c index 825fd44d4cf..1f980282417 100644 --- a/dlls/mmdevapi/session.c +++ b/dlls/mmdevapi/session.c @@ -52,7 +52,6 @@ static void set_stream_volumes(struct audio_client *This) params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0;
WINE_UNIX_CALL(set_volumes, ¶ms); } diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h index 37b4c53cb35..b1e025a512b 100644 --- a/dlls/mmdevapi/unixlib.h +++ b/dlls/mmdevapi/unixlib.h @@ -207,7 +207,6 @@ struct set_volumes_params float master_volume; const float *volumes; const float *session_volumes; - int channel; };
struct set_event_handle_params diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 2b5f61eb213..200798a64e6 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2767,7 +2767,6 @@ static NTSTATUS alsa_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -2775,7 +2774,6 @@ static NTSTATUS alsa_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return alsa_set_volumes(¶ms); } diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6ea8882de59..96d71e98272 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -261,7 +261,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0;
ALSA_CALL(set_volumes, ¶ms); } diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 902d01459c4..83c8048ff43 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -2046,7 +2046,6 @@ static NTSTATUS unix_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -2054,7 +2053,6 @@ static NTSTATUS unix_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return unix_set_volumes(¶ms); } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 6f62a69028b..f387e9f71ab 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -232,7 +232,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0;
UNIX_CALL(set_volumes, ¶ms); } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 89dbeac62bc..d41d0597721 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -271,7 +271,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol); params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0; OSS_CALL(set_volumes, ¶ms); }
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 96d84a07d00..035f6eced97 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1974,7 +1974,6 @@ static NTSTATUS oss_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -1982,7 +1981,6 @@ static NTSTATUS oss_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return oss_set_volumes(¶ms); } diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 59e2d086d0b..c3bc02267b5 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -316,7 +316,6 @@ static void set_stream_volumes(ACImpl *This) params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; params.volumes = This->vols; params.session_volumes = This->session->channel_vols; - params.channel = 0; pulse_call(set_volumes, ¶ms); }
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 28afb5b788d..a3354c5efe2 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2723,7 +2723,6 @@ static NTSTATUS pulse_wow64_set_volumes(void *args) float master_volume; PTR32 volumes; PTR32 session_volumes; - int channel; } *params32 = args; struct set_volumes_params params = { @@ -2731,7 +2730,6 @@ static NTSTATUS pulse_wow64_set_volumes(void *args) .master_volume = params32->master_volume, .volumes = ULongToPtr(params32->volumes), .session_volumes = ULongToPtr(params32->session_volumes), - .channel = params32->channel }; return pulse_set_volumes(¶ms); }
-
Alexandre Julliard