Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
affd447d
Commit
affd447d
authored
Dec 12, 2007
by
Maarten Lankhorst
Committed by
Alexandre Julliard
Dec 13, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winealsa: Don't require a cswitch control for capture.
parent
f75600dd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
mixer.c
dlls/winealsa.drv/mixer.c
+7
-6
No files found.
dlls/winealsa.drv/mixer.c
View file @
affd447d
...
@@ -233,8 +233,7 @@ static int blacklisted(snd_mixer_elem_t *elem)
...
@@ -233,8 +233,7 @@ static int blacklisted(snd_mixer_elem_t *elem)
BOOL
blisted
=
0
;
BOOL
blisted
=
0
;
if
(
!
snd_mixer_selem_has_playback_volume
(
elem
)
&&
if
(
!
snd_mixer_selem_has_playback_volume
(
elem
)
&&
(
!
snd_mixer_selem_has_capture_volume
(
elem
)
||
!
snd_mixer_selem_has_capture_volume
(
elem
))
!
snd_mixer_selem_has_capture_switch
(
elem
)))
blisted
=
1
;
blisted
=
1
;
TRACE
(
"%s: %x
\n
"
,
name
,
blisted
);
TRACE
(
"%s: %x
\n
"
,
name
,
blisted
);
...
@@ -382,7 +381,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_
...
@@ -382,7 +381,7 @@ static void filllines(mixer *mmixer, snd_mixer_elem_t *mastelem, snd_mixer_elem_
else
if
(
!
capt
)
else
if
(
!
capt
)
continue
;
continue
;
if
(
capt
&&
snd_mixer_selem_has_capture_
switch
(
elem
))
if
(
capt
&&
snd_mixer_selem_has_capture_
volume
(
elem
))
{
{
(
++
mline
)
->
component
=
comp
;
(
++
mline
)
->
component
=
comp
;
MultiByteToWideChar
(
CP_UNIXCP
,
0
,
name
,
-
1
,
mline
->
name
,
MAXPNAMELEN
);
MultiByteToWideChar
(
CP_UNIXCP
,
0
,
name
,
-
1
,
mline
->
name
,
MAXPNAMELEN
);
...
@@ -473,7 +472,7 @@ static void ALSA_MixerInit(void)
...
@@ -473,7 +472,7 @@ static void ALSA_MixerInit(void)
captelem
=
elem
;
captelem
=
elem
;
else
if
(
!
blacklisted
(
elem
))
else
if
(
!
blacklisted
(
elem
))
{
{
if
(
snd_mixer_selem_has_capture_
switch
(
elem
))
if
(
snd_mixer_selem_has_capture_
volume
(
elem
))
++
capcontrols
;
++
capcontrols
;
if
(
snd_mixer_selem_has_playback_volume
(
elem
))
if
(
snd_mixer_selem_has_playback_volume
(
elem
))
{
{
...
@@ -1306,14 +1305,14 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags)
...
@@ -1306,14 +1305,14 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags)
return
MMSYSERR_INVALPARAM
;
return
MMSYSERR_INVALPARAM
;
}
}
Ml
->
fdwLine
=
MIXERLINE_LINEF_ACTIVE
;
Ml
->
dwUser
=
0
;
Ml
->
dwUser
=
0
;
Ml
->
fdwLine
=
MIXERLINE_LINEF_DISCONNECTED
;
switch
(
qf
)
switch
(
qf
)
{
{
case
MIXER_GETLINEINFOF_COMPONENTTYPE
:
case
MIXER_GETLINEINFOF_COMPONENTTYPE
:
{
{
Ml
->
dwLineID
=
0xFFFF
;
Ml
->
dwLineID
=
0xFFFF
;
TRACE
(
"Looking for componenttype %d/%x
\n
"
,
Ml
->
dwComponentType
,
Ml
->
dwComponentType
);
for
(
idx
=
0
;
idx
<
mmixer
->
chans
;
++
idx
)
for
(
idx
=
0
;
idx
<
mmixer
->
chans
;
++
idx
)
if
(
mmixer
->
lines
[
idx
].
component
==
Ml
->
dwComponentType
)
if
(
mmixer
->
lines
[
idx
].
component
==
Ml
->
dwComponentType
)
{
{
...
@@ -1383,6 +1382,8 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags)
...
@@ -1383,6 +1382,8 @@ static DWORD MIX_GetLineInfo(UINT wDevID, LPMIXERLINEW Ml, DWORD_PTR flags)
return
MMSYSERR_INVALPARAM
;
return
MMSYSERR_INVALPARAM
;
}
}
Ml
->
fdwLine
&=
~
MIXERLINE_LINEF_DISCONNECTED
;
Ml
->
fdwLine
|=
MIXERLINE_LINEF_ACTIVE
;
if
(
Ml
->
dwLineID
>=
mmixer
->
dests
)
if
(
Ml
->
dwLineID
>=
mmixer
->
dests
)
Ml
->
fdwLine
|=
MIXERLINE_LINEF_SOURCE
;
Ml
->
fdwLine
|=
MIXERLINE_LINEF_SOURCE
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment