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

[SNDVOL32] Enable the balance and volume trackbars only if the line has a volume fader control.

Browse source
This commit is contained in:
Eric Kohl 2019-02-16 13:54:46 +01:00
parent 2b1f6c8b0d
commit 0dd4b354b4
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
base/applications/sndvol32/dialog.c
View file

@ -175,6 +175,9 @@ AddDialogControl(
{ {
/* Vertical trackbar: Volume */ /* Vertical trackbar: Volume */
/* Disable the volume trackbar by default */
EnableWindow(hwnd, FALSE);
/* set up range */ /* set up range */
SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX)); SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(VOLUME_MIN, VOLUME_MAX));
@ -195,6 +198,9 @@ AddDialogControl(
{ {
/* Horizontal trackbar: Balance */ /* Horizontal trackbar: Balance */
/* Disable the balance trackbar by default */
EnableWindow(hwnd, FALSE);
/* set up range */ /* set up range */
SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, BALANCE_STEPS)); SendMessage(hwnd, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, BALANCE_STEPS));
@ -488,7 +494,7 @@ EnumConnectionsCallback(
/* now go through all controls and update their states */ /* now go through all controls and update their states */
for (Index = 0; Index < Line->cControls; Index++) for (Index = 0; Index < Line->cControls; Index++)
{ {
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;
@ -516,7 +522,7 @@ EnumConnectionsCallback(
} }
} }
} }
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(Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1) if (SndMixerGetVolumeControlDetails(Mixer, Control[Index].dwControlID, Line->cChannels, sizeof(MIXERCONTROLDETAILS_UNSIGNED), (LPVOID)pVolumeDetails) != -1)
@ -582,6 +588,9 @@ EnumConnectionsCallback(
/* check state */ /* check state */
LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0);
/* Enable the volume trackbar */
EnableWindow(hDlgCtrl, TRUE);
if (OldPosition != (VOLUME_MAX - volumePosition)) if (OldPosition != (VOLUME_MAX - volumePosition))
{ {
/* update control state */ /* update control state */
@ -589,19 +598,7 @@ EnumConnectionsCallback(
} }
} }
if (Line->cChannels == 1) if (Line->cChannels == 2)
{
/* Disable the balance trackbar for mono channels */
wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ;
/* get dialog control */
hDlgCtrl = GetDlgItem(PrefContext->MixerWindow->hWnd, wID);
if (hDlgCtrl != NULL)
{
EnableWindow(hDlgCtrl, FALSE);
}
}
else if (Line->cChannels == 2)
{ {
/* Set the balance trackbar */ /* Set the balance trackbar */
wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ; wID = (PrefContext->Count + 1) * IDC_LINE_SLIDER_HORZ;
@ -614,6 +611,9 @@ EnumConnectionsCallback(
/* check state */ /* check state */
LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0); LRESULT OldPosition = SendMessageW(hDlgCtrl, TBM_GETPOS, 0, 0);
/* Enable the balance trackbar */
EnableWindow(hDlgCtrl, TRUE);
if (OldPosition != balancePosition) if (OldPosition != balancePosition)
{ {
/* update control state */ /* update control state */