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
23fadaad
Commit
23fadaad
authored
Aug 24, 2022
by
Davide Beatrici
Committed by
Alexandre Julliard
Aug 24, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winepulse: Adapt "create_stream_params" struct to mmdevapi's.
parent
850a2611
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
16 deletions
+20
-16
mmdevdrv.c
dlls/winepulse.drv/mmdevdrv.c
+4
-3
pulse.c
dlls/winepulse.drv/pulse.c
+12
-10
unixlib.h
dlls/winepulse.drv/unixlib.h
+4
-3
No files found.
dlls/winepulse.drv/mmdevdrv.c
View file @
23fadaad
...
...
@@ -875,11 +875,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
}
params
.
name
=
name
=
get_application_name
(
TRUE
);
params
.
pulse_name
=
This
->
pulse_name
;
params
.
dataflow
=
This
->
dataflow
;
params
.
mode
=
mode
;
params
.
device
=
This
->
pulse_name
;
params
.
flow
=
This
->
dataflow
;
params
.
share
=
mode
;
params
.
flags
=
flags
;
params
.
duration
=
duration
;
params
.
period
=
period
;
params
.
fmt
=
fmt
;
params
.
stream
=
&
stream
;
params
.
channel_count
=
&
channel_count
;
...
...
dlls/winepulse.drv/pulse.c
View file @
23fadaad
...
...
@@ -1108,7 +1108,7 @@ static NTSTATUS pulse_create_stream(void *args)
return
STATUS_SUCCESS
;
}
stream
->
dataflow
=
params
->
data
flow
;
stream
->
dataflow
=
params
->
flow
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
stream
->
vol
);
++
i
)
stream
->
vol
[
i
]
=
1
.
f
;
...
...
@@ -1119,7 +1119,7 @@ static NTSTATUS pulse_create_stream(void *args)
goto
exit
;
period
=
0
;
hr
=
get_device_period_helper
(
params
->
dataflow
,
params
->
pulse_nam
e
,
&
period
,
NULL
);
hr
=
get_device_period_helper
(
params
->
flow
,
params
->
devic
e
,
&
period
,
NULL
);
if
(
FAILED
(
hr
))
goto
exit
;
...
...
@@ -1134,9 +1134,9 @@ static NTSTATUS pulse_create_stream(void *args)
bufsize_bytes
=
stream
->
bufsize_frames
*
pa_frame_size
(
&
stream
->
ss
);
stream
->
mmdev_period_usec
=
period
/
10
;
stream
->
share
=
params
->
mod
e
;
stream
->
share
=
params
->
shar
e
;
stream
->
flags
=
params
->
flags
;
hr
=
pulse_stream_connect
(
stream
,
params
->
pulse_nam
e
,
stream
->
period_bytes
);
hr
=
pulse_stream_connect
(
stream
,
params
->
devic
e
,
stream
->
period_bytes
);
if
(
SUCCEEDED
(
hr
))
{
UINT32
unalign
;
const
pa_buffer_attr
*
attr
=
pa_stream_get_buffer_attr
(
stream
->
stream
);
...
...
@@ -2417,11 +2417,12 @@ static NTSTATUS pulse_wow64_create_stream(void *args)
struct
{
PTR32
name
;
PTR32
pulse_nam
e
;
EDataFlow
data
flow
;
AUDCLNT_SHAREMODE
mod
e
;
PTR32
devic
e
;
EDataFlow
flow
;
AUDCLNT_SHAREMODE
shar
e
;
DWORD
flags
;
REFERENCE_TIME
duration
;
REFERENCE_TIME
period
;
PTR32
fmt
;
HRESULT
result
;
PTR32
channel_count
;
...
...
@@ -2430,11 +2431,12 @@ static NTSTATUS pulse_wow64_create_stream(void *args)
struct
create_stream_params
params
=
{
.
name
=
ULongToPtr
(
params32
->
name
),
.
pulse_name
=
ULongToPtr
(
params32
->
pulse_nam
e
),
.
dataflow
=
params32
->
data
flow
,
.
mode
=
params32
->
mod
e
,
.
device
=
ULongToPtr
(
params32
->
devic
e
),
.
flow
=
params32
->
flow
,
.
share
=
params32
->
shar
e
,
.
flags
=
params32
->
flags
,
.
duration
=
params32
->
duration
,
.
period
=
params32
->
period
,
.
fmt
=
ULongToPtr
(
params32
->
fmt
),
.
channel_count
=
ULongToPtr
(
params32
->
channel_count
),
.
stream
=
ULongToPtr
(
params32
->
stream
)
...
...
dlls/winepulse.drv/unixlib.h
View file @
23fadaad
...
...
@@ -53,11 +53,12 @@ struct get_endpoint_ids_params
struct
create_stream_params
{
const
char
*
name
;
const
char
*
pulse_nam
e
;
EDataFlow
data
flow
;
AUDCLNT_SHAREMODE
mod
e
;
const
char
*
devic
e
;
EDataFlow
flow
;
AUDCLNT_SHAREMODE
shar
e
;
DWORD
flags
;
REFERENCE_TIME
duration
;
REFERENCE_TIME
period
;
const
WAVEFORMATEX
*
fmt
;
HRESULT
result
;
UINT32
*
channel_count
;
...
...
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