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
883f1f34
Commit
883f1f34
authored
Jun 01, 2023
by
Davide Beatrici
Committed by
Alexandre Julliard
Jun 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winecoreaudio: Use mmdevapi's session_wrapper_create.
parent
ba630ab7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
29 deletions
+6
-29
mmdevdrv.c
dlls/winecoreaudio.drv/mmdevdrv.c
+6
-29
No files found.
dlls/winecoreaudio.drv/mmdevdrv.c
View file @
883f1f34
...
@@ -70,7 +70,8 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug =
...
@@ -70,7 +70,8 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug =
static
CRITICAL_SECTION
g_sessions_lock
=
{
&
g_sessions_lock_debug
,
-
1
,
0
,
0
,
0
,
0
};
static
CRITICAL_SECTION
g_sessions_lock
=
{
&
g_sessions_lock_debug
,
-
1
,
0
,
0
,
0
,
0
};
static
struct
list
g_sessions
=
LIST_INIT
(
g_sessions
);
static
struct
list
g_sessions
=
LIST_INIT
(
g_sessions
);
static
AudioSessionWrapper
*
AudioSessionWrapper_Create
(
ACImpl
*
client
);
extern
struct
audio_session_wrapper
*
session_wrapper_create
(
struct
audio_client
*
client
)
DECLSPEC_HIDDEN
;
void
DECLSPEC_HIDDEN
sessions_lock
(
void
)
void
DECLSPEC_HIDDEN
sessions_lock
(
void
)
{
{
...
@@ -899,7 +900,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
...
@@ -899,7 +900,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
*
ppv
=
&
This
->
IAudioStreamVolume_iface
;
*
ppv
=
&
This
->
IAudioStreamVolume_iface
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IAudioSessionControl
)){
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IAudioSessionControl
)){
if
(
!
This
->
session_wrapper
){
if
(
!
This
->
session_wrapper
){
This
->
session_wrapper
=
AudioSessionWrapper_C
reate
(
This
);
This
->
session_wrapper
=
session_wrapper_c
reate
(
This
);
if
(
!
This
->
session_wrapper
){
if
(
!
This
->
session_wrapper
){
hr
=
E_OUTOFMEMORY
;
hr
=
E_OUTOFMEMORY
;
goto
end
;
goto
end
;
...
@@ -910,7 +911,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
...
@@ -910,7 +911,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
*
ppv
=
&
This
->
session_wrapper
->
IAudioSessionControl2_iface
;
*
ppv
=
&
This
->
session_wrapper
->
IAudioSessionControl2_iface
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IChannelAudioVolume
)){
}
else
if
(
IsEqualIID
(
riid
,
&
IID_IChannelAudioVolume
)){
if
(
!
This
->
session_wrapper
){
if
(
!
This
->
session_wrapper
){
This
->
session_wrapper
=
AudioSessionWrapper_C
reate
(
This
);
This
->
session_wrapper
=
session_wrapper_c
reate
(
This
);
if
(
!
This
->
session_wrapper
){
if
(
!
This
->
session_wrapper
){
hr
=
E_OUTOFMEMORY
;
hr
=
E_OUTOFMEMORY
;
goto
end
;
goto
end
;
...
@@ -921,7 +922,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
...
@@ -921,7 +922,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
*
ppv
=
&
This
->
session_wrapper
->
IChannelAudioVolume_iface
;
*
ppv
=
&
This
->
session_wrapper
->
IChannelAudioVolume_iface
;
}
else
if
(
IsEqualIID
(
riid
,
&
IID_ISimpleAudioVolume
)){
}
else
if
(
IsEqualIID
(
riid
,
&
IID_ISimpleAudioVolume
)){
if
(
!
This
->
session_wrapper
){
if
(
!
This
->
session_wrapper
){
This
->
session_wrapper
=
AudioSessionWrapper_C
reate
(
This
);
This
->
session_wrapper
=
session_wrapper_c
reate
(
This
);
if
(
!
This
->
session_wrapper
){
if
(
!
This
->
session_wrapper
){
hr
=
E_OUTOFMEMORY
;
hr
=
E_OUTOFMEMORY
;
goto
end
;
goto
end
;
...
@@ -989,30 +990,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
...
@@ -989,30 +990,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
client_InitializeSharedAudioStream
,
client_InitializeSharedAudioStream
,
};
};
static
AudioSessionWrapper
*
AudioSessionWrapper_Create
(
ACImpl
*
client
)
{
AudioSessionWrapper
*
ret
;
ret
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
AudioSessionWrapper
));
if
(
!
ret
)
return
NULL
;
ret
->
IAudioSessionControl2_iface
.
lpVtbl
=
&
AudioSessionControl2_Vtbl
;
ret
->
ISimpleAudioVolume_iface
.
lpVtbl
=
&
SimpleAudioVolume_Vtbl
;
ret
->
IChannelAudioVolume_iface
.
lpVtbl
=
&
ChannelAudioVolume_Vtbl
;
ret
->
ref
=
1
;
ret
->
client
=
client
;
if
(
client
){
ret
->
session
=
client
->
session
;
IAudioClient3_AddRef
(
&
client
->
IAudioClient3_iface
);
}
return
ret
;
}
HRESULT
WINAPI
AUDDRV_GetAudioSessionWrapper
(
const
GUID
*
guid
,
IMMDevice
*
device
,
HRESULT
WINAPI
AUDDRV_GetAudioSessionWrapper
(
const
GUID
*
guid
,
IMMDevice
*
device
,
AudioSessionWrapper
**
out
)
AudioSessionWrapper
**
out
)
{
{
...
@@ -1022,7 +999,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device
...
@@ -1022,7 +999,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
return
hr
;
return
hr
;
*
out
=
AudioSessionWrapper_C
reate
(
NULL
);
*
out
=
session_wrapper_c
reate
(
NULL
);
if
(
!*
out
)
if
(
!*
out
)
return
E_OUTOFMEMORY
;
return
E_OUTOFMEMORY
;
...
...
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