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
cf230457
Commit
cf230457
authored
Mar 02, 2005
by
Jeremy White
Committed by
Alexandre Julliard
Mar 02, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More correctly establish cases where the OSS input buffer should not
be enabled.
parent
7dea79c4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
0 deletions
+18
-0
audio.c
dlls/winmm/wineoss/audio.c
+16
-0
dsrender.c
dlls/winmm/wineoss/dsrender.c
+2
-0
No files found.
dlls/winmm/wineoss/audio.c
View file @
cf230457
...
...
@@ -375,11 +375,27 @@ static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int strict_format)
ossdev
->
bOutputEnabled
=
((
trigger
&
PCM_ENABLE_OUTPUT
)
==
PCM_ENABLE_OUTPUT
);
ossdev
->
bInputEnabled
=
((
trigger
&
PCM_ENABLE_INPUT
)
==
PCM_ENABLE_INPUT
);
/* If we do not have full duplex, but they opened RDWR
** (as you have to in order for an mmap to succeed)
** then we start out with input off
*/
if
(
ossdev
->
open_access
==
O_RDWR
&&
!
ossdev
->
full_duplex
&&
ossdev
->
bInputEnabled
&&
ossdev
->
bOutputEnabled
)
{
ossdev
->
bInputEnabled
=
FALSE
;
trigger
&=
~
PCM_ENABLE_INPUT
;
ioctl
(
fd
,
SNDCTL_DSP_SETTRIGGER
,
&
trigger
);
}
}
else
{
ossdev
->
bOutputEnabled
=
TRUE
;
/* OSS enables by default */
ossdev
->
bInputEnabled
=
TRUE
;
/* OSS enables by default */
}
if
(
ossdev
->
open_access
==
O_RDONLY
)
ossdev
->
bOutputEnabled
=
FALSE
;
if
(
ossdev
->
open_access
==
O_WRONLY
)
ossdev
->
bInputEnabled
=
FALSE
;
return
MMSYSERR_NOERROR
;
error:
...
...
dlls/winmm/wineoss/dsrender.c
View file @
cf230457
...
...
@@ -735,6 +735,7 @@ static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface)
/* make sure the card doesn't start playing before we want it to */
WOutDev
[
This
->
wDevID
].
ossdev
->
bOutputEnabled
=
FALSE
;
WOutDev
[
This
->
wDevID
].
ossdev
->
bInputEnabled
=
FALSE
;
enable
=
getEnables
(
WOutDev
[
This
->
wDevID
].
ossdev
);
if
(
ioctl
(
WOutDev
[
This
->
wDevID
].
ossdev
->
fd
,
SNDCTL_DSP_SETTRIGGER
,
&
enable
)
<
0
)
{
ERR
(
"ioctl(%s, SNDCTL_DSP_SETTRIGGER) failed (%s)
\n
"
,
WOutDev
[
This
->
wDevID
].
ossdev
->
dev_name
,
strerror
(
errno
));
...
...
@@ -815,6 +816,7 @@ static HRESULT WINAPI DSD_CreatePrimaryBuffer(PIDSDRIVER iface,
*
ppbBuffer
=
(
*
ippdsdb
)
->
mapping
;
/* some drivers need some extra nudging after mapping */
WOutDev
[
This
->
wDevID
].
ossdev
->
bInputEnabled
=
FALSE
;
WOutDev
[
This
->
wDevID
].
ossdev
->
bOutputEnabled
=
FALSE
;
enable
=
getEnables
(
WOutDev
[
This
->
wDevID
].
ossdev
);
if
(
ioctl
((
*
ippdsdb
)
->
fd
,
SNDCTL_DSP_SETTRIGGER
,
&
enable
)
<
0
)
{
...
...
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