Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 05:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SNDVOL32] Advanced Controls dialog: Initialize the Other Controls

Browse source
This commit is contained in:
Eric Kohl 2019-02-23 12:51:14 +01:00
parent 02e84521cc
commit 2e797accd3
3 changed files with 60 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
base/applications/sndvol32/advanced.c
View file

@ -13,16 +13,20 @@ OnInitDialog(
HWND hwndDlg, HWND hwndDlg,
PADVANCED_CONTEXT Context) PADVANCED_CONTEXT Context)
{ {
WCHAR szRawTitle[256], szCookedTitle[256];
MIXERCONTROLDETAILS_UNSIGNED UnsignedDetails; MIXERCONTROLDETAILS_UNSIGNED UnsignedDetails;
MIXERCONTROLDETAILS_BOOLEAN BooleanDetails;
WCHAR szRawBuffer[256], szCookedBuffer[256];
LPMIXERCONTROL Control = NULL; LPMIXERCONTROL Control = NULL;
UINT ControlCount = 0, Index; UINT ControlCount = 0, Index;
DWORD i, dwStep, dwPosition; DWORD i, dwStep, dwPosition;
DWORD dwOtherControls = 0;
RECT rect;
LONG dy;
/* Set the dialog title */ /* Set the dialog title */
LoadStringW(hAppInstance, IDS_ADVANCED_CONTROLS, szRawTitle, ARRAYSIZE(szRawTitle)); LoadStringW(hAppInstance, IDS_ADVANCED_CONTROLS, szRawBuffer, ARRAYSIZE(szRawBuffer));
StringCchPrintfW(szCookedTitle, ARRAYSIZE(szCookedTitle), szRawTitle, Context->LineName); StringCchPrintfW(szCookedBuffer, ARRAYSIZE(szCookedBuffer), szRawBuffer, Context->LineName);
SetWindowTextW(hwndDlg, szCookedTitle); SetWindowTextW(hwndDlg, szCookedBuffer);
/* Disable the tone controls */ /* Disable the tone controls */
for (i = IDC_ADV_BASS_LOW; i<= IDC_ADV_TREBLE_SLIDER; i++) for (i = IDC_ADV_BASS_LOW; i<= IDC_ADV_TREBLE_SLIDER; i++)
@ -56,6 +60,8 @@ OnInitDialog(
{ {
if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_BASS) if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_BASS)
{ {
/* Bass control */
if (SndMixerGetVolumeControlDetails(Context->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&UnsignedDetails) != -1) if (SndMixerGetVolumeControlDetails(Context->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&UnsignedDetails) != -1)
{ {
for (i = IDC_ADV_BASS_LOW; i<= IDC_ADV_BASS_SLIDER; i++) for (i = IDC_ADV_BASS_LOW; i<= IDC_ADV_BASS_SLIDER; i++)
@ -68,6 +74,8 @@ OnInitDialog(
} }
else if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_TREBLE) else if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_TREBLE)
{ {
/* Treble control */
if (SndMixerGetVolumeControlDetails(Context->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&UnsignedDetails) != -1) if (SndMixerGetVolumeControlDetails(Context->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)&UnsignedDetails) != -1)
{ {
for (i = IDC_ADV_TREBLE_LOW; i<= IDC_ADV_TREBLE_SLIDER; i++) for (i = IDC_ADV_TREBLE_LOW; i<= IDC_ADV_TREBLE_SLIDER; i++)
@ -78,18 +86,56 @@ OnInitDialog(
SendDlgItemMessageW(hwndDlg, IDC_ADV_TREBLE_SLIDER, TBM_SETPOS, (WPARAM)TRUE, dwPosition); SendDlgItemMessageW(hwndDlg, IDC_ADV_TREBLE_SLIDER, TBM_SETPOS, (WPARAM)TRUE, dwPosition);
} }
} }
else if (Control[Index].dwControlType != MIXERCONTROL_CONTROLTYPE_VOLUME && else if (((Control[Index].dwControlType & (MIXERCONTROL_CT_CLASS_MASK | MIXERCONTROL_CT_SUBCLASS_MASK | MIXERCONTROL_CT_UNITS_MASK)) == MIXERCONTROL_CONTROLTYPE_BOOLEAN) &&
Control[Index].dwControlType != MIXERCONTROL_CONTROLTYPE_MUTE) (Control[Index].dwControlType != MIXERCONTROL_CONTROLTYPE_MUTE))
{ {
ShowWindow(GetDlgItem(hwndDlg, IDC_ADV_OTHER_CONTROLS), SW_SHOWNORMAL); /* All boolean controls but the Mute control (Maximum of 2) */
ShowWindow(GetDlgItem(hwndDlg, IDC_ADV_OTHER_TEXT), SW_SHOWNORMAL);
if (dwOtherControls < 2)
{
if (SndMixerGetVolumeControlDetails(Context->Mixer, Control[Index].dwControlID, 1, sizeof(MIXERCONTROLDETAILS_BOOLEAN), (LPVOID)&BooleanDetails) != -1)
{
LoadStringW(hAppInstance, IDS_OTHER_CONTROLS1 + dwOtherControls, szRawBuffer, ARRAYSIZE(szRawBuffer));
StringCchPrintfW(szCookedBuffer, ARRAYSIZE(szCookedBuffer), szRawBuffer, Control[Index].szName);
SetWindowTextW(GetDlgItem(hwndDlg, IDC_ADV_OTHER_CHECK1 + dwOtherControls), szCookedBuffer);
ShowWindow(GetDlgItem(hwndDlg, IDC_ADV_OTHER_CHECK1 + dwOtherControls), SW_SHOWNORMAL);
SendDlgItemMessageW(hwndDlg, IDC_ADV_OTHER_CHECK1 + dwOtherControls, BM_SETCHECK, (WPARAM)BooleanDetails.fValue, 0);
dwOtherControls++;
}
}
} }
} }
/* free controls */ /* free controls */
HeapFree(GetProcessHeap(), 0, Control); HeapFree(GetProcessHeap(), 0, Control);
} }
if (dwOtherControls != 0)
{
/* Show the 'Other controls' groupbox and text */
ShowWindow(GetDlgItem(hwndDlg, IDC_ADV_OTHER_CONTROLS), SW_SHOWNORMAL);
ShowWindow(GetDlgItem(hwndDlg, IDC_ADV_OTHER_TEXT), SW_SHOWNORMAL);
/* Resize the dialog */
GetWindowRect(hwndDlg, &rect);
dy = MulDiv(73, Context->MixerWindow->baseUnit.cy, 8);
rect.bottom += dy;
SetWindowPos(hwndDlg, HWND_TOP, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOMOVE | SWP_NOZORDER);
/* Move the 'Close' button down */
GetWindowRect(GetDlgItem(hwndDlg, IDOK), &rect);
MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, 2);
rect.top += dy;
rect.bottom += dy;
SetWindowPos(GetDlgItem(hwndDlg, IDOK), HWND_TOP, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOSIZE | SWP_NOZORDER);
}
} }

9
base/applications/sndvol32/sndvol32.c
View file

@ -658,7 +658,7 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx)
{ {
if (Context->bVertical) if (Context->bVertical)
{ {
if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER) if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME)
{ {
DWORD LineOffset, volumePosition, balancePosition; DWORD LineOffset, volumePosition, balancePosition;
DWORD volumeStep, balanceStep; DWORD volumeStep, balanceStep;
@ -724,7 +724,7 @@ SetVolumeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVOID Ctx)
} }
else if (Context->bSwitch) else if (Context->bSwitch)
{ {
if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_SWITCH) if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE)
{ {
/* set up details */ /* set up details */
bDetails.fValue = Context->SliderPos; bDetails.fValue = Context->SliderPos;
@ -783,7 +783,7 @@ MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVO
{ {
if (Control[Index].dwControlID == PtrToUlong(Context)) if (Control[Index].dwControlID == PtrToUlong(Context))
{ {
if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_SWITCH) if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE)
{ {
MIXERCONTROLDETAILS_BOOLEAN Details; MIXERCONTROLDETAILS_BOOLEAN Details;
@ -794,7 +794,7 @@ MixerControlChangeCallback(PSND_MIXER Mixer, DWORD LineID, LPMIXERLINE Line, PVO
UpdateDialogLineSwitchControl(&Preferences, Line, Details.fValue); UpdateDialogLineSwitchControl(&Preferences, Line, Details.fValue);
} }
} }
else if ((Control[Index].dwControlType & MIXERCONTROL_CT_CLASS_MASK) == MIXERCONTROL_CT_CLASS_FADER) else if (Control[Index].dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME)
{ {
/* get volume control details */ /* get volume control details */
if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1) if (SndMixerGetVolumeControlDetails(Preferences.MixerWindow->Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1)
@ -1025,6 +1025,7 @@ MainWindowProc(HWND hwnd,
/* get line name */ /* get line name */
if (GetDlgItemTextW(hwnd, CtrlID, AdvancedContext.LineName, MIXER_LONG_NAME_CHARS) != 0) if (GetDlgItemTextW(hwnd, CtrlID, AdvancedContext.LineName, MIXER_LONG_NAME_CHARS) != 0)
{ {
AdvancedContext.MixerWindow = Preferences.MixerWindow;
AdvancedContext.Mixer = Preferences.MixerWindow->Mixer; AdvancedContext.Mixer = Preferences.MixerWindow->Mixer;
AdvancedContext.Line = SndMixerGetLineByName(Preferences.MixerWindow->Mixer, AdvancedContext.Line = SndMixerGetLineByName(Preferences.MixerWindow->Mixer,
Preferences.SelectedLine, Preferences.SelectedLine,

1
base/applications/sndvol32/sndvol32.h
View file

@ -127,6 +127,7 @@ typedef struct _SET_VOLUME_CONTEXT
typedef struct _ADVANCED_CONTEXT typedef struct _ADVANCED_CONTEXT
{ {
WCHAR LineName[MIXER_LONG_NAME_CHARS]; WCHAR LineName[MIXER_LONG_NAME_CHARS];
PMIXER_WINDOW MixerWindow;
PSND_MIXER Mixer; PSND_MIXER Mixer;
LPMIXERLINE Line; LPMIXERLINE Line;
} ADVANCED_CONTEXT, *PADVANCED_CONTEXT; } ADVANCED_CONTEXT, *PADVANCED_CONTEXT;