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
6b9df950
Commit
6b9df950
authored
Jun 06, 2023
by
Davide Beatrici
Committed by
Alexandre Julliard
Jun 06, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winepulse: Move session_wrapper_create into mmdevapi.
parent
231e4512
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
27 deletions
+32
-27
session.c
dlls/mmdevapi/session.c
+28
-0
mmdevdrv.c
dlls/winepulse.drv/mmdevdrv.c
+4
-27
No files found.
dlls/mmdevapi/session.c
View file @
6b9df950
/*
* Copyright 2011-2012 Maarten Lankhorst
* Copyright 2010-2011 Maarten Lankhorst for CodeWeavers
* Copyright 2011 Andrew Eikum for CodeWeavers
* Copyright 2022 Huw Davies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
...
...
@@ -545,3 +550,26 @@ const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl =
simplevolume_SetMute
,
simplevolume_GetMute
};
struct
audio_session_wrapper
*
session_wrapper_create
(
struct
audio_client
*
client
)
{
struct
audio_session_wrapper
*
ret
;
ret
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
struct
audio_session_wrapper
));
if
(
!
ret
)
return
NULL
;
ret
->
IAudioSessionControl2_iface
.
lpVtbl
=
&
AudioSessionControl2_Vtbl
;
ret
->
IChannelAudioVolume_iface
.
lpVtbl
=
&
ChannelAudioVolume_Vtbl
;
ret
->
ISimpleAudioVolume_iface
.
lpVtbl
=
&
SimpleAudioVolume_Vtbl
;
ret
->
ref
=
1
;
ret
->
client
=
client
;
if
(
client
)
{
ret
->
session
=
client
->
session
;
IAudioClient3_AddRef
(
&
client
->
IAudioClient3_iface
);
}
return
ret
;
}
dlls/winepulse.drv/mmdevdrv.c
View file @
6b9df950
...
...
@@ -134,7 +134,8 @@ extern const IAudioClockVtbl AudioClock_Vtbl;
extern
const
IAudioClock2Vtbl
AudioClock2_Vtbl
;
extern
const
IAudioStreamVolumeVtbl
AudioStreamVolume_Vtbl
;
static
AudioSessionWrapper
*
AudioSessionWrapper_Create
(
ACImpl
*
client
);
extern
struct
audio_session_wrapper
*
session_wrapper_create
(
struct
audio_client
*
client
)
DECLSPEC_HIDDEN
;
static
inline
ACImpl
*
impl_from_IAudioClient3
(
IAudioClient3
*
iface
)
{
...
...
@@ -1057,7 +1058,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
IsEqualIID
(
riid
,
&
IID_ISimpleAudioVolume
))
{
const
BOOLEAN
new_session
=
!
This
->
session_wrapper
;
if
(
new_session
)
{
This
->
session_wrapper
=
AudioSessionWrapper_C
reate
(
This
);
This
->
session_wrapper
=
session_wrapper_c
reate
(
This
);
if
(
!
This
->
session_wrapper
)
return
E_OUTOFMEMORY
;
}
...
...
@@ -1125,30 +1126,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
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
,
AudioSessionWrapper
**
out
)
{
...
...
@@ -1158,7 +1135,7 @@ HRESULT WINAPI AUDDRV_GetAudioSessionWrapper(const GUID *guid, IMMDevice *device
if
(
FAILED
(
hr
))
return
hr
;
*
out
=
AudioSessionWrapper_C
reate
(
NULL
);
*
out
=
session_wrapper_c
reate
(
NULL
);
if
(
!*
out
)
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