Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
e5551393
Commit
e5551393
authored
May 22, 2012
by
Andrew Eikum
Committed by
Alexandre Julliard
May 22, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineoss.drv: Resolve some diff between winealsa and wineoss.
parent
1c37857a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
12 deletions
+14
-12
mmdevdrv.c
dlls/wineoss.drv/mmdevdrv.c
+14
-12
No files found.
dlls/wineoss.drv/mmdevdrv.c
View file @
e5551393
...
...
@@ -1571,12 +1571,12 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface)
if
(
This
->
dataflow
==
eRender
){
This
->
written_frames
=
0
;
This
->
last_pos_frames
=
0
;
}
else
{
This
->
written_frames
+=
This
->
held_frames
;
}
This
->
lcl_offs_frames
=
0
;
This
->
held_frames
=
0
;
This
->
l
ast_po
s_frames
=
0
;
This
->
l
cl_off
s_frames
=
0
;
LeaveCriticalSection
(
&
This
->
lock
);
...
...
@@ -1752,8 +1752,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
UINT32
frames
,
BYTE
**
data
)
{
ACImpl
*
This
=
impl_from_IAudioRenderClient
(
iface
);
UINT32
pad
,
write_pos
;
HRESULT
hr
;
UINT32
write_pos
;
TRACE
(
"(%p)->(%u, %p)
\n
"
,
This
,
frames
,
data
);
...
...
@@ -1774,13 +1773,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface,
return
S_OK
;
}
hr
=
IAudioClient_GetCurrentPadding
(
&
This
->
IAudioClient_iface
,
&
pad
);
if
(
FAILED
(
hr
)){
LeaveCriticalSection
(
&
This
->
lock
);
return
hr
;
}
if
(
pad
+
frames
>
This
->
bufsize_frames
){
if
(
This
->
held_frames
+
frames
>
This
->
bufsize_frames
){
LeaveCriticalSection
(
&
This
->
lock
);
return
AUDCLNT_E_BUFFER_TOO_LARGE
;
}
...
...
@@ -2029,7 +2022,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize(
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
frames
);
return
AudioClient_GetCurrentPadding
(
&
This
->
IAudioClient_iface
,
frames
);
if
(
!
frames
)
return
E_POINTER
;
EnterCriticalSection
(
&
This
->
lock
);
*
frames
=
This
->
held_frames
<
This
->
period_frames
?
0
:
This
->
period_frames
;
LeaveCriticalSection
(
&
This
->
lock
);
return
S_OK
;
}
static
const
IAudioCaptureClientVtbl
AudioCaptureClient_Vtbl
=
...
...
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