[PATCH 0/1] MR10655: winecfg: Support 7.1 speaker config.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56664 {width=357 height=452} -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10655
From: Mohamad Al-Jaf <mohamadaljaf@gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56664 --- programs/winecfg/audio.c | 2 ++ programs/winecfg/resource.h | 16 +++++++++------- programs/winecfg/winecfg.rc | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 102ffc502db..08fad2e849d 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -70,6 +70,8 @@ static const struct DWORD speaker_mask; } speaker_configs[] = { + { IDS_AUDIO_SPEAKER_7POINT1_WIDE, KSAUDIO_SPEAKER_7POINT1 }, + { IDS_AUDIO_SPEAKER_7POINT1, KSAUDIO_SPEAKER_7POINT1_SURROUND }, { IDS_AUDIO_SPEAKER_5POINT1, KSAUDIO_SPEAKER_5POINT1 }, { IDS_AUDIO_SPEAKER_QUAD, KSAUDIO_SPEAKER_QUAD }, { IDS_AUDIO_SPEAKER_STEREO, KSAUDIO_SPEAKER_STEREO }, diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index b7b237221b0..716cbb23d02 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -150,13 +150,15 @@ #define IDS_AUDIO_SYSDEFAULT 1311 #define IDS_AUDIO_DEVICE 1312 #define IDC_SPEAKERCONFIG_SPEAKERS 1313 -#define IDS_AUDIO_SPEAKER_5POINT1 1314 -#define IDS_AUDIO_SPEAKER_QUAD 1315 -#define IDS_AUDIO_SPEAKER_STEREO 1316 -#define IDS_AUDIO_SPEAKER_MONO 1317 -#define IDC_LIST_AUDIO_DEVICES 1318 -#define IDS_AUDIO_SPEAKER_CONFIG 1319 -#define IDC_MIDI_DEVICE 1320 +#define IDS_AUDIO_SPEAKER_7POINT1_WIDE 1314 +#define IDS_AUDIO_SPEAKER_7POINT1 1315 +#define IDS_AUDIO_SPEAKER_5POINT1 1316 +#define IDS_AUDIO_SPEAKER_QUAD 1317 +#define IDS_AUDIO_SPEAKER_STEREO 1318 +#define IDS_AUDIO_SPEAKER_MONO 1319 +#define IDC_LIST_AUDIO_DEVICES 1320 +#define IDS_AUDIO_SPEAKER_CONFIG 1321 +#define IDC_MIDI_DEVICE 1322 /* desktop integration tab */ #define IDC_THEME_COLORCOMBO 1401 diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 73a189aa5ed..9af971631b4 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -86,6 +86,8 @@ BEGIN IDS_AUDIO_SYSDEFAULT "(System default)" IDS_AUDIO_DEVICE "Device" IDS_AUDIO_SPEAKER_CONFIG "Speaker configuration" + IDS_AUDIO_SPEAKER_7POINT1_WIDE "7.1 Surround Wide" + IDS_AUDIO_SPEAKER_7POINT1 "7.1 Surround" IDS_AUDIO_SPEAKER_5POINT1 "5.1 Surround" IDS_AUDIO_SPEAKER_QUAD "Quadraphonic" IDS_AUDIO_SPEAKER_STEREO "Stereo" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10655
The docs for [KSAUDIO_CHANNEL_CONFIG](https://learn.microsoft.com/en-us/windows-hardware/drivers/ddi/ksmedia/ns-ks...) say that "The KSAUDIO_SPEAKER_7POINT1 speaker configuration, is obsolete and no longer supported". [Another page](https://learn.microsoft.com/en-us/windows-hardware/drivers/audio/header-file...) also mentions that "In Windows Vista and later versions of Windows, the KSAUDIO_SPEAKER_7POINT1 speaker configuration is no longer supported. As a result, it is not an available option in Control Panel." -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10655#note_136017
participants (3)
-
Brendan Shanks (@bshanks) -
Mohamad Al-Jaf -
Mohamad Al-Jaf (@maljaf)